[phpwiki-checkins] CVS: phpwiki/lib PageType.php,1.54,1.55

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32412

Modified Files:
	PageType.php 
Log Message:
do not urlencode Upload links twice

Index: PageType.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/PageType.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -2 -b -p -d -r1.54 -r1.55
--- PageType.php	12 Sep 2007 19:35:29 -0000	1.54
+++ PageType.php	6 May 2008 19:24:24 -0000	1.55
@@ -202,6 +202,10 @@ class PageType_interwikimap extends Page
         // Urlencode page only if it's a query arg.
         // FIXME: this is a somewhat broken heuristic.
+        if ($moniker == 'Upload') {
+            $page_enc = $page;
+            $page = rawurldecode($page);
+        } else {
         $page_enc = strstr($url, '?') ? rawurlencode($page) : $page;
-
+        }
         if (strstr($url, '%s'))
             $url = sprintf($url, $page_enc);
@@ -544,4 +548,7 @@ class PageFormatter_MediaWiki extends Pa
 
 // $Log$
+// Revision 1.55  2008/05/06 19:24:24  rurban
+// do not urlencode Upload links twice
+//
 // Revision 1.54  2007/09/12 19:35:29  rurban
 // Windows fix for local path detection