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

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

Revision: 9071
          http://sourceforge.net/p/phpwiki/code/9071
Author:   vargenau
Date:     2014-09-12 11:53:25 +0000 (Fri, 12 Sep 2014)
Log Message:
-----------
Make recursive include trap work between Template and IncludePage

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

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2014-09-12 09:48:10 UTC (rev 9070)
+++ trunk/lib/plugin/IncludePage.php	2014-09-12 11:53:25 UTC (rev 9071)
@@ -88,7 +88,7 @@
         // A page can include itself once (this is needed, e.g.,  when editing
         // TextFormattingRules).
         // Protect from recursive inclusion.
-        static $rootpage = '';
+        global $rootpage;
         if ($rootpage == '') {
             $rootpage = $basepage;
         }

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2014-09-12 09:48:10 UTC (rev 9070)
+++ trunk/lib/plugin/Template.php	2014-09-12 11:53:25 UTC (rev 9071)
@@ -120,7 +120,7 @@
         }
 
         // Protect from recursive inclusion.
-        static $rootpage = '';
+        global $rootpage;
         if ($rootpage == '') {
             $rootpage = $basepage;
         }

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