SF.net SVN: phpwiki:[10986] trunk/lib

Revision: 10986
          http://sourceforge.net/p/phpwiki/code/10986
Author:   vargenau
Date:     2022-02-07 15:10:22 +0000 (Mon, 07 Feb 2022)
Log Message:
-----------
Make WantedPages work for DATABASE_TYPE = dba and file

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PDO.php
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiDB/backend/PearDB_mysqli.php
    trunk/lib/plugin/WantedPages.php

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2022-02-07 12:08:16 UTC (rev 10985)
+++ trunk/lib/WikiDB/backend/PDO.php	2022-02-07 15:10:22 UTC (rev 10986)
@@ -1090,7 +1090,7 @@
              left join page on(link.linkto=page.id) left join nonempty on(link.linkto=nonempty.id)
              where isnull(nonempty.id) and linked.id=link.linkfrom;
         */
-        $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
+        $sql = "SELECT p.pagename AS wantedfrom, pp.pagename AS pagename"
             . " FROM $page_tbl p JOIN $link_tbl linked"
             . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id"
             . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id"

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2022-02-07 12:08:16 UTC (rev 10985)
+++ trunk/lib/WikiDB/backend/PearDB.php	2022-02-07 15:10:22 UTC (rev 10986)
@@ -885,7 +885,7 @@
             $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
         }
 
-        $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
+        $sql = "SELECT p.pagename AS wantedfrom, pp.pagename AS pagename"
             . " 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"

Modified: trunk/lib/WikiDB/backend/PearDB_mysqli.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysqli.php	2022-02-07 12:08:16 UTC (rev 10985)
+++ trunk/lib/WikiDB/backend/PearDB_mysqli.php	2022-02-07 15:10:22 UTC (rev 10986)
@@ -112,11 +112,12 @@
         if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom')))
             $orderby = 'ORDER BY ' . $orderby;
 
-        if ($exclude) // array of pagenames
+        if ($exclude) { // array of pagenames
             $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
+        }
 
     /* ISNULL is mysql specific */
-        $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
+        $sql = "SELECT p.pagename AS wantedfrom, pp.pagename AS pagename"
             . " 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)"

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2022-02-07 12:08:16 UTC (rev 10985)
+++ trunk/lib/plugin/WantedPages.php	2022-02-07 15:10:22 UTC (rev 10986)
@@ -122,8 +122,8 @@
             list($offset, $maxcount) = $pagelist->limit($limit);
             $wanted_iter = $dbi->wantedPages($exclude, $sortby, $limit);
             while ($row = $wanted_iter->next()) {
-                $wantedfrom = $row['pagename'];
-                $wanted = $row['wantedfrom'];
+                $wantedfrom = $row['wantedfrom'];
+                $wanted = $row['pagename'];
                 if (!in_array($wantedfrom, $exclude_from)) {
                     // ignore duplicates:
                     if (empty($pagelist->_wpagelist[$wanted]))

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