[phpwiki-checkins] CVS: phpwiki/lib interwiki.php,1.8,1.9

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
	interwiki.php 
Log Message:
Don't urlencode page name for use as link text.


Index: interwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** interwiki.php	2001/11/14 18:48:47	1.8
--- interwiki.php	2001/12/06 18:36:51	1.9
***************
*** 30,40 ****
  
      // Urlencode page only if it's a query arg.
!     if (strstr($url, '?'))
!         $page = rawurlencode($page);
! 
      if (strstr($url, '%s'))
!         $url = sprintf($url, $page);
      else
!         $url .= $page;
  
      if ($linktext) {
--- 30,40 ----
  
      // Urlencode page only if it's a query arg.
!     // FIXME: this is a somewhat broken heuristic.
!     $page_enc = strstr($url, '?') ? rawurlencode($page) : $page;
!     
      if (strstr($url, '%s'))
!         $url = sprintf($url, $page_enc);
      else
!         $url .= $page_enc;
  
      if ($linktext) {