[phpwiki-checkins] SF.net SVN: phpwiki:[7011] trunk/lib/BlockParser.php

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

Revision: 7011
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7011&view=rev
Author:   vargenau
Date:     2009-07-09 09:21:02 +0000 (Thu, 09 Jul 2009)

Log Message:
-----------
Sublist elements might have the same content

Modified Paths:
--------------
    trunk/lib/BlockParser.php

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2009-07-08 09:46:35 UTC (rev 7010)
+++ trunk/lib/BlockParser.php	2009-07-09 09:21:02 UTC (rev 7011)
@@ -550,13 +550,9 @@
         $li = &$this->_content[0];
         $li->setTightness($top, $bot);
     }
-    
+
     function merge ($nextBlock) {
         if (isa($nextBlock, 'Block_list') and $this->_tag == $nextBlock->_tag) {
-            if ($nextBlock->_content === $this->_content) {
-            	trigger_error("Internal Error: no block advance", E_USER_NOTICE);
-            	return false;
-            }
             array_splice($this->_content, count($this->_content), 0,
                          $nextBlock->_content);
             return $this;


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