Index: phpwiki-release-1_2-branch/lib/transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.8.2.1
diff -u -r1.8.2.1 transform.php
--- phpwiki-release-1_2-branch/lib/transform.php	2001/03/02 03:48:47	1.8.2.1
+++ phpwiki-release-1_2-branch/lib/transform.php	2001/09/21 17:52:07
@@ -32,12 +32,6 @@
    }
 
 
-   // only call these once, for efficiency
-   $quick_search_box  = RenderQuickSearch();
-   $full_search_box   = RenderFullSearch();
-   $most_popular_list = RenderMostPopular();
-
-
    // Loop over all lines of the page and apply transformation rules
    $numlines = count($pagehash["content"]);
 
@@ -245,9 +239,12 @@
       // These are still problems as far as generating correct HTML is
       // concerned.  Paragraph (<p>) elements are not allowed to contain
       // other block-level elements (like <form>s). 
-      $tmpline = str_replace('%%Search%%', $quick_search_box, $tmpline);
-      $tmpline = str_replace('%%Fullsearch%%', $full_search_box, $tmpline);
-      $tmpline = str_replace('%%Mostpopular%%', $most_popular_list, $tmpline);
+      if (strstr($tmpline, '%%Search%%'))
+         $tmpline = str_replace('%%Search%%', RenderQuickSearch(), $tmpline);
+      if (strstr($tmpline, '%%Fullsearch%%'))
+         $tmpline = str_replace('%%Fullsearch%%', RenderFullSearch(), $tmpline);
+      if (strstr($tmpline, '%%Mostpopular%%'))
+         $tmpline = str_replace('%%Mostpopular%%', RenderMostPopular(), $tmpline);
 if(defined('WIKI_ADMIN') && strstr($tmpline, '%%ADMIN-'))
          $tmpline = ParseAdminTokens($tmpline);