From 4bb0a5221ed15a00b875aacbba715b5b45f3031a Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 25 Sep 2014 12:51:51 +0000
Subject: [PATCH] Make <includeonly> work

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@9116 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/BlockParser.php            | 7 ++++++-
 pgsrc/Help%2FIncludePagePlugin | 8 +++++++-
 pgsrc/ReleaseNotes             | 3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/BlockParser.php b/lib/BlockParser.php
index 5cbcbef8c..4e39d431e 100644
--- a/lib/BlockParser.php
+++ b/lib/BlockParser.php
@@ -909,7 +909,7 @@ class Block_oldlists extends Block_list
 
 class Block_pre extends BlockMarkup
 {
-    public $_re = '<(?:pre|verbatim|nowiki|noinclude)>';
+    public $_re = '<(?:pre|verbatim|nowiki|noinclude|includeonly)>';
 
     function _match(&$input, $m)
     {
@@ -927,6 +927,11 @@ class Block_pre extends BlockMarkup
         }
         $input->advance();
 
+        if ($m->match == '<includeonly>') {
+            $this->_element = new Block_HtmlElement('div', false, '');
+            return true;
+        }
+
         if ($m->match == '<nowiki>')
             $text = join("<br>\n", $text);
         else
diff --git a/pgsrc/Help%2FIncludePagePlugin b/pgsrc/Help%2FIncludePagePlugin
index 760730f67..3cd6347e3 100644
--- a/pgsrc/Help%2FIncludePagePlugin
+++ b/pgsrc/Help%2FIncludePagePlugin
@@ -1,4 +1,4 @@
-Date: Thu,  4 Sep 2014 18:14:45 +0000
+Date: Thu, 25 Sep 2014 14:11:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FIncludePagePlugin;
@@ -60,6 +60,12 @@ The pages will render in distinct tables.
 | false
 |}
 
+== Inclusion ==
+
+~<noinclude> .. ~</noinclude> is stripped.
+
+~<includeonly> .. ~</includeonly> is only expanded in included pages.
+
 == Examples ==
 
 === ~IncludePage page=Help/~AllPagesPlugin ===
diff --git a/pgsrc/ReleaseNotes b/pgsrc/ReleaseNotes
index 3c0fe9f8d..79411faaa 100644
--- a/pgsrc/ReleaseNotes
+++ b/pgsrc/ReleaseNotes
@@ -1,4 +1,4 @@
-Date: Thu, 25 Sep 2014 10:11:57 +0000
+Date: Thu, 25 Sep 2014 14:11:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -18,6 +18,7 @@ Content-Transfer-Encoding: binary
 * correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe
 * fix Bug#607 BackLinks do not work inside a RichTable
 * fix Bug#646 Wrong number of links in BackLinks
+* make <includeonly> work
 
 == 1.5.0 2014-07-29 Marc-Etienne Vargenau ==
 
-- 
2.45.0