[phpwiki-checkins] SF.net SVN: phpwiki:[8088] trunk/lib/WikiDB.php

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

Revision: 8088
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8088&view=rev
Author:   vargenau
Date:     2011-06-01 12:17:46 +0000 (Wed, 01 Jun 2011)

Log Message:
-----------
This is not an error if include_empty=1 in AllPages

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2011-05-20 14:29:42 UTC (rev 8087)
+++ trunk/lib/WikiDB.php	2011-06-01 12:17:46 UTC (rev 8088)
@@ -1817,24 +1817,15 @@
      * @return WikiDB_Page The next WikiDB_Page in the sequence.
      */
     function next () {
-        if ( ! ($next = $this->_iter->next()) )
+        if ( ! ($next = $this->_iter->next()) ) {
             return false;
+        }
 
         $pagename = &$next['pagename'];
-    if (!is_string($pagename)) { // Bug #1327912 fixed by Joachim Lous
-        /*if (is_array($pagename) && isset($pagename['linkto'])) {
-        $pagename = $pagename['linkto'];
-        }
-            $pagename = strval($pagename);*/
+        if (!is_string($pagename)) { // Bug #1327912 fixed by Joachim Lous
             trigger_error("WikiDB_PageIterator->next pagename", E_USER_WARNING);
-    }
-        if (!$pagename) {
-            if (isset($next['linkrelation'])
-                or isset($next['pagedata']['linkrelation'])) return false;
-            trigger_error('empty pagename in WikiDB_PageIterator::next()', E_USER_WARNING);
-            var_dump($next);
-            return false;
         }
+
         // There's always hits, but we cache only if more
         // (well not with file, cvs and dba)
         if (isset($next['pagedata']) and count($next['pagedata']) > 1) {


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