[phpwiki-checkins] SF.net SVN: phpwiki:[9116] trunk

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

Revision: 9116
          http://sourceforge.net/p/phpwiki/code/9116
Author:   vargenau
Date:     2014-09-25 12:51:51 +0000 (Thu, 25 Sep 2014)
Log Message:
-----------
Make <includeonly> work

Modified Paths:
--------------
    trunk/lib/BlockParser.php
    trunk/pgsrc/Help%2FIncludePagePlugin
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2014-09-25 10:38:58 UTC (rev 9115)
+++ trunk/lib/BlockParser.php	2014-09-25 12:51:51 UTC (rev 9116)
@@ -909,7 +909,7 @@
 
 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 @@
         }
         $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

Modified: trunk/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagePlugin	2014-09-25 10:38:58 UTC (rev 9115)
+++ trunk/pgsrc/Help%2FIncludePagePlugin	2014-09-25 12:51:51 UTC (rev 9116)
@@ -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 @@
 | false
 |}
 
+== Inclusion ==
+
+~<noinclude> .. ~</noinclude> is stripped.
+
+~<includeonly> .. ~</includeonly> is only expanded in included pages.
+
 == Examples ==
 
 === ~IncludePage page=Help/~AllPagesPlugin ===

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2014-09-25 10:38:58 UTC (rev 9115)
+++ trunk/pgsrc/ReleaseNotes	2014-09-25 12:51:51 UTC (rev 9116)
@@ -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 @@
 * 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 ==
 

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