[phpwiki-checkins] CVS: phpwiki/lib WikiDB.php,1.148,1.149

[Reini U. <ru...@us...>]

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

Modified Files:
	WikiDB.php 
Log Message:
isWikiPage no error on empty pagenames. MailNotify->onChangePage fix by ??

Index: WikiDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB.php,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -2 -b -p -d -r1.148 -r1.149
--- WikiDB.php	27 Jan 2007 21:53:03 -0000	1.148
+++ WikiDB.php	17 Feb 2007 14:16:37 -0000	1.149
@@ -195,5 +195,5 @@ class WikiDB {
     function isWikiPage ($pagename) {
         $page = $this->getPage($pagename);
-        return $page->exists();
+        return ($page and $page->exists());
     }
 
@@ -995,5 +995,5 @@ class WikiDB_Page 
                 include_once("lib/MailNotify.php");
                 $MailNotify = new MailNotify($newrevision->getName());
-                $MailNotify->onChangePage ($this, $wikitext, $version, $meta);
+                $MailNotify->onChangePage ($this->_wikidb, $wikitext, $version, $meta);
             }
             $newrevision->_transformedContent = $formatted;
@@ -1585,6 +1585,7 @@ class WikiDB_PageRevision
         $data = &$this->_data;
 
-        
-        if (empty($data['%content'])) {
+        if (empty($data['%content'])
+            || (!$this->_wikidb->isWikiPage($this->_pagename)
+                && $this->isCurrent())) {
             include_once('lib/InlineParser.php');
 
@@ -1767,5 +1768,9 @@ class WikiDB_PageIterator
         $pagename = &$next['pagename'];
         if (!is_string($pagename)) { // Bug #1327912 fixed by Joachim Lous
-            $pagename = strval($pagename);
+	    /*if (is_array($pagename) && isset($pagename['linkto'])) {
+		$pagename = $pagename['linkto'];
+	    }
+            $pagename = strval($pagename);*/
+            trigger_error("WikiDB_PageIterator->next pagename", E_USER_WARNING);
         }
         if (!$pagename) {
@@ -2189,4 +2194,7 @@ function _sql_debuglog_shutdown_function
 
 // $Log$
+// Revision 1.149  2007/02/17 14:16:37  rurban
+// isWikiPage no error on empty pagenames. MailNotify->onChangePage fix by ??
+//
 // Revision 1.148  2007/01/27 21:53:03  rurban
 // Use TEMP_DIR for debug sql.log