From 34a49bc76f5fc2d5161939a6a8a3fdb630f4cb3f Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Tue, 4 Jan 2011 17:55:44 +0000
Subject: [PATCH] Make trapping of recursive inclusion work.

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@7806 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/plugin/IncludePage.php | 10 ++++------
 lib/plugin/Template.php    | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/plugin/IncludePage.php b/lib/plugin/IncludePage.php
index f318f07cf..96e99001b 100644
--- a/lib/plugin/IncludePage.php
+++ b/lib/plugin/IncludePage.php
@@ -1,8 +1,8 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
 /*
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
- * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright 2008-2011 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -89,7 +89,7 @@ extends WikiPlugin
         // TextFormattingRules).
         static $included_pages = array();
         if (in_array($page, $included_pages)) {
-            return $this->error(sprintf(_("recursive inclusion of page %s ignored"),
+            return $this->error(sprintf(_("Recursive inclusion of page %s ignored"),
                                         $page));
         }
 
@@ -129,7 +129,7 @@ extends WikiPlugin
             }
             // trap recursive redirects
             if (in_array($m[1], $included_pages)) {
-                return $this->error(sprintf(_("recursive inclusion of page %s ignored"),
+                return $this->error(sprintf(_("Recursive inclusion of page %s ignored"),
                                                 $page.' => '.$m[1]));
             }
             $page = $m[1];
@@ -152,8 +152,6 @@ extends WikiPlugin
         include_once('lib/BlockParser.php');
         $content = TransformText($ct, $r->get('markup'), $page);
 
-        array_pop($included_pages);
-
         if ($quiet)
             return $content;
 
diff --git a/lib/plugin/Template.php b/lib/plugin/Template.php
index 1f8709f2f..8af73a41d 100644
--- a/lib/plugin/Template.php
+++ b/lib/plugin/Template.php
@@ -1,8 +1,8 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
 /*
  * Copyright 2005,2007 $ThePhpWikiProgrammingTeam
- * Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright 2008-2011 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -127,7 +127,7 @@ extends WikiPlugin
         // Protect from recursive inclusion. A page can include itself once
         static $included_pages = array();
         if (in_array($page, $included_pages)) {
-            return $this->error(sprintf(_("recursive inclusion of page %s"),
+            return $this->error(sprintf(_("Recursive inclusion of page %s"),
                                         $page));
         }
 
@@ -168,7 +168,7 @@ extends WikiPlugin
             }
             // trap recursive redirects
             if (in_array($m[1], $included_pages)) {
-                return $this->error(sprintf(_("recursive inclusion of page %s ignored"),
+                return $this->error(sprintf(_("Recursive inclusion of page %s ignored"),
                                                 $page.' => '.$m[1]));
             }
             $page = $m[1];
@@ -204,8 +204,6 @@ extends WikiPlugin
             $content = TransformInline($initial_content, $r->get('markup'), $page);
         }
 
-        array_pop($included_pages);
-
         return $content;
     }
 
-- 
2.45.0