[phpwiki-checkins] SF.net SVN: phpwiki:[10982] trunk/lib

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

Revision: 10982
          http://sourceforge.net/p/phpwiki/code/10982
Author:   vargenau
Date:     2022-02-05 17:15:23 +0000 (Sat, 05 Feb 2022)
Log Message:
-----------
Remove exclude_from argument from functions wanted_pages and wantedPages

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2022-02-05 17:08:06 UTC (rev 10981)
+++ trunk/lib/WikiDB/backend/PDO.php	2022-02-05 17:15:23 UTC (rev 10982)
@@ -1071,7 +1071,7 @@
     /*
      * Find referenced empty pages.
      */
-    function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+    function wanted_pages($exclude = '', $sortby = '', $limit = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2022-02-05 17:08:06 UTC (rev 10981)
+++ trunk/lib/WikiDB/backend/PearDB.php	2022-02-05 17:15:23 UTC (rev 10982)
@@ -874,7 +874,7 @@
     /*
      * Find referenced empty pages.
      */
-    function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+    function wanted_pages($exclude = '', $sortby = '', $limit = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2022-02-05 17:08:06 UTC (rev 10981)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2022-02-05 17:15:23 UTC (rev 10982)
@@ -551,7 +551,7 @@
     /*
      * Find referenced empty pages.
      */
-    function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+    function wanted_pages($exclude = '', $sortby = '', $limit = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);

Modified: trunk/lib/WikiDB/backend/PearDB_mysqli.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysqli.php	2022-02-05 17:08:06 UTC (rev 10981)
+++ trunk/lib/WikiDB/backend/PearDB_mysqli.php	2022-02-05 17:15:23 UTC (rev 10982)
@@ -105,7 +105,7 @@
     /*
      * Find referenced empty pages.
      */
-    function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+    function wanted_pages($exclude = '', $sortby = '', $limit = '')
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2022-02-05 17:08:06 UTC (rev 10981)
+++ trunk/lib/WikiDB/backend.php	2022-02-05 17:15:23 UTC (rev 10982)
@@ -403,7 +403,7 @@
         return new WikiDB_backend_dumb_MostRecentIter($this, $pages, $params);
     }
 
-    public function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+    public function wanted_pages($exclude = '', $sortby = '', $limit = '')
     {
         include_once 'lib/WikiDB/backend/dumb/WantedPagesIter.php';
         $allpages = $this->get_all_pages(true, false, false, $exclude_from);

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2022-02-05 17:08:06 UTC (rev 10981)
+++ trunk/lib/WikiDB.php	2022-02-05 17:15:23 UTC (rev 10982)
@@ -442,7 +442,6 @@
     }
 
     /**
-     * @param string $exclude_from
      * @param string $exclude
      * @param string $sortby Optional. "+-column,+-column2".
      *        If false the result is faster in natural order.
@@ -451,9 +450,9 @@
      * @return WikiDB_backend_dumb_WantedPagesIter A generic iterator containing rows of
      *         (duplicate) pagename, wantedfrom.
      */
-    public function wantedPages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+    public function wantedPages($exclude = '', $sortby = '', $limit = '')
     {
-        return $this->_backend->wanted_pages($exclude_from, $exclude, $sortby, $limit);
+        return $this->_backend->wanted_pages($exclude, $sortby, $limit);
     }
 
     /**

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2022-02-05 17:08:06 UTC (rev 10981)
+++ trunk/lib/plugin/WantedPages.php	2022-02-05 17:15:23 UTC (rev 10982)
@@ -120,7 +120,7 @@
 
         if (!$page) {
             list($offset, $maxcount) = $pagelist->limit($limit);
-            $wanted_iter = $dbi->wantedPages($exclude_from, $exclude, $sortby, $limit);
+            $wanted_iter = $dbi->wantedPages($exclude, $sortby, $limit);
             while ($row = $wanted_iter->next()) {
                 $wantedfrom = $row['pagename'];
                 $wanted = $row['wantedfrom'];

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