CVS: phpwiki/lib BlockParser.php,1.53,1.54

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10157

Modified Files:
        BlockParser.php 
Log Message:
do not warn on empty nextBlock

Index: BlockParser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/BlockParser.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -2 -b -p -d -r1.53 -r1.54
--- BlockParser.php     29 Jan 2005 20:36:44 -0000      1.53
+++ BlockParser.php     29 Jan 2005 21:00:54 -0000      1.54
@@ -351,5 +351,8 @@ class ParsedBlock extends Block_HtmlElem
         // php5 failed to advance the block. php5 copies objects by ref.
         // nextBlock == block, both are the same objects. So we have to clone 
it.
-        for ($block = $this->_getBlock($input); $block; $block = 
clone($nextBlock)) {
+        for ($block = $this->_getBlock($input); 
+             $block; 
+             $block = (is_object($nextBlock) ? clone($nextBlock) : $nextBlock))
+        {
             while ($nextBlock = $this->_getBlock($input)) {
                 // Attempt to merge current with following block.
@@ -1090,4 +1093,7 @@ function TransformText ($text, $markup =
 
 // $Log$
+// Revision 1.54  2005/01/29 21:00:54  rurban
+// do not warn on empty nextBlock
+//
 // Revision 1.53  2005/01/29 20:36:44  rurban
 // very important php5 fix! clone objects



-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl