[phpwiki-checkins] CVS: phpwiki/lib Toolbar.php,1.3,1.4

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv30646

Modified Files:
	Toolbar.php 
Log Message:
Moved rawurlencode($pagename) to inside of toolbar_Warning_IsCurrent(). (No more toolbar functions try to directly access the database.)

Index: Toolbar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Toolbar.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Toolbar.php	2002/01/03 15:40:40	1.3
--- Toolbar.php	2002/01/03 15:47:06	1.4
***************
*** 54,63 ****
  //Calling function should provide:
  //$is_current = ($current->getVersion() == $revision->getVersion())
! //$pageurl = (rawurlencode($pagename))
! function toolbar_Warning_IsCurrent($is_current, $pageurl) {
      $html = "";
      if (!$is_current) {
          $html .= "<p><strong>" ._("Note:") ."</strong> " ._("You are viewing an old revision of this page.");
!         $html .= "<a href=\"" .WikiURL('') .$pageurl ."\">" ._("View the current version") ."</a>.</p>";
  	$html .= "<hr class=\"ignore\" noshade=\"noshade\" />";
      }
--- 54,63 ----
  //Calling function should provide:
  //$is_current = ($current->getVersion() == $revision->getVersion())
! //$pagename = ($pagename)
! function toolbar_Warning_IsCurrent($is_current, $pagename) {
      $html = "";
      if (!$is_current) {
          $html .= "<p><strong>" ._("Note:") ."</strong> " ._("You are viewing an old revision of this page.");
!         $html .= "<a href=\"" .WikiURL('') .rawurlencode($pagename) ."\">" ._("View the current version") ."</a>.</p>";
  	$html .= "<hr class=\"ignore\" noshade=\"noshade\" />";
      }