Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv18637/lib
Modified Files:
Tag: release-1_2-branch
transform.php
Log Message:
Efficiency patch from Gary Benson <ga...@in...>: don't compute
MostPopular list unless it's needed.
Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -r1.8.2.1 -r1.8.2.2
*** transform.php 2001/03/02 03:48:47 1.8.2.1
--- transform.php 2001/09/21 19:15:12 1.8.2.2
***************
*** 33,42 ****
- // 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"]);
--- 33,36 ----
***************
*** 246,252 ****
// 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(defined('WIKI_ADMIN') && strstr($tmpline, '%%ADMIN-'))
$tmpline = ParseAdminTokens($tmpline);
--- 240,249 ----
// concerned. Paragraph (<p>) elements are not allowed to contain
// other block-level elements (like <form>s).
! 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);
|
