[phpwiki-checkins] SF.net SVN: phpwiki:[9612] trunk/lib/WikiDB/backend

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

Revision: 9612
          http://sourceforge.net/p/phpwiki/code/9612
Author:   vargenau
Date:     2015-03-06 10:53:35 +0000 (Fri, 06 Mar 2015)
Log Message:
-----------
Update comments

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiDB/backend/PearDB_mysql.php

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2015-03-06 10:46:43 UTC (rev 9611)
+++ trunk/lib/WikiDB/backend/PearDB.php	2015-03-06 10:53:35 UTC (rev 9612)
@@ -891,14 +891,6 @@
         if ($exclude) // array of pagenames
             $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
 
-        /*
-         all empty pages, independent of linkstatus:
-           select pagename as empty from page left join nonempty using(id) where is null(nonempty.id);
-         only all empty pages, which have a linkto:
-           select page.pagename, linked.pagename as wantedfrom from link, page linked
-             left join page on link.linkto=page.id left join nonempty on link.linkto=nonempty.id
-             where nonempty.id is null and linked.id=link.linkfrom;
-        */
         $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
             . " FROM $page_tbl p, $link_tbl linked"
             . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id"
@@ -909,7 +901,6 @@
             . $exclude
             . $orderby;
         if ($limit) {
-            // oci8 error: WHERE NULL = NULL appended
             list($from, $count) = $this->limit($limit);
             $result = $dbh->limitQuery($sql, $from, $count * 3);
         } else {

Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysql.php	2015-03-06 10:46:43 UTC (rev 9611)
+++ trunk/lib/WikiDB/backend/PearDB_mysql.php	2015-03-06 10:53:35 UTC (rev 9612)
@@ -105,7 +105,9 @@
             . " GROUP BY id");
     }
 
-    /* ISNULL is mysql specific */
+    /*
+     * Find referenced empty pages.
+     */
     function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
     {
         $dbh = &$this->_dbh;
@@ -118,7 +120,8 @@
         if ($exclude) // array of pagenames
             $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
 
-        $sql = "SELECT p.pagename, pp.pagename as wantedfrom"
+    /* ISNULL is mysql specific */
+        $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
             . " FROM $page_tbl p, $link_tbl linked"
             . " LEFT JOIN $page_tbl pp ON (linked.linkto = pp.id)"
             . " LEFT JOIN $nonempty_tbl ne ON (linked.linkto = ne.id)"

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