[phpwiki-checkins] SF.net SVN: phpwiki:[7269] trunk/lib/plugin

[<var...@us...>]

Revision: 7269
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7269&view=rev
Author:   vargenau
Date:     2009-11-20 16:37:58 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Follow redirects even when page name contains spaces

Modified Paths:
--------------
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/Template.php

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2009-11-20 12:09:00 UTC (rev 7268)
+++ trunk/lib/plugin/IncludePage.php	2009-11-20 16:37:58 UTC (rev 7269)
@@ -109,10 +109,10 @@
         $c = $r->getContent();
         
         // follow redirects
-        if ((preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\S+)\s*\?'.'>/', 
-                       implode("\n", $c), $m))
-          or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/',
-                       implode("\n", $c), $m)))
+        if ((preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\S+)\s*\?'.'>/', implode("\n", $c), $m))
+          or (preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(.*?)\s*\?'.'>/', implode("\n", $c), $m))
+          or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/', implode("\n", $c), $m))
+          or (preg_match('/<<\s*RedirectTo\s+page="(.*?)"\s*>>/', implode("\n", $c), $m)))
         {
             // Strip quotes (simple or double) from page name if any
             if ((string_starts_with($m[1], "'"))

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2009-11-20 12:09:00 UTC (rev 7268)
+++ trunk/lib/plugin/Template.php	2009-11-20 16:37:58 UTC (rev 7269)
@@ -148,10 +148,10 @@
 
         $content = $r->getContent();
         // follow redirects
-        if ((preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\S+)\s*\?'.'>/',
-                       implode("\n", $content), $m))
-          or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/',
-                       implode("\n", $content), $m)))
+        if ((preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\S+)\s*\?'.'>/', implode("\n", $content), $m))
+          or (preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(.*?)\s*\?'.'>/', implode("\n", $content), $m))
+          or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/', implode("\n", $content), $m))
+          or (preg_match('/<<\s*RedirectTo\s+page="(.*?)"\s*>>/', implode("\n", $content), $m)))
         {
             // Strip quotes (simple or double) from page name if any
             if ((string_starts_with($m[1], "'")) 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.