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

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

Revision: 7838
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7838&view=rev
Author:   vargenau
Date:     2011-01-17 14:47:32 +0000 (Mon, 17 Jan 2011)

Log Message:
-----------
Revert r7806; correction prevented to include a page twice in the same page

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

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2011-01-14 11:12:00 UTC (rev 7837)
+++ trunk/lib/plugin/IncludePage.php	2011-01-17 14:47:32 UTC (rev 7838)
@@ -152,6 +152,8 @@
         include_once('lib/BlockParser.php');
         $content = TransformText($ct, $r->get('markup'), $page);
 
+        array_pop($included_pages);
+
         if ($quiet)
             return $content;
 

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2011-01-14 11:12:00 UTC (rev 7837)
+++ trunk/lib/plugin/Template.php	2011-01-17 14:47:32 UTC (rev 7838)
@@ -204,6 +204,8 @@
             $content = TransformInline($initial_content, $r->get('markup'), $page);
         }
 
+        array_pop($included_pages);
+
         return $content;
     }
 


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