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

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

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

Modified Files:
	interwiki.php 
Log Message:
Add support for '%s' (which gets replaced by rhs of interwiki link)
in interwiki map URLs.  (This is needed for the new RFC entry in
interwiki.map.)


Index: interwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** interwiki.php	2001/09/19 02:36:24	1.7
--- interwiki.php	2001/11/14 18:48:47	1.8
***************
*** 31,35 ****
      // Urlencode page only if it's a query arg.
      if (strstr($url, '?'))
!         $url .= rawurlencode($page);
      else
          $url .= $page;
--- 31,38 ----
      // 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;