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

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

Revision: 11061
          http://sourceforge.net/p/phpwiki/code/11061
Author:   vargenau
Date:     2023-07-18 14:34:38 +0000 (Tue, 18 Jul 2023)
Log Message:
-----------
function get_all_pages exclude argument is not always a string, might be an array

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/dbaBase.php
    trunk/lib/WikiDB/backend/file.php

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2023-07-18 14:15:47 UTC (rev 11060)
+++ trunk/lib/WikiDB/backend/PDO.php	2023-07-18 14:34:38 UTC (rev 11061)
@@ -875,7 +875,7 @@
         bool   $include_empty = false,
         string $sortby = '',
         string $limit = '',
-        string $exclude = ''
+        $exclude = ''
     )
     {
         $dbh = &$this->_dbh;

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2023-07-18 14:15:47 UTC (rev 11060)
+++ trunk/lib/WikiDB/backend/PearDB.php	2023-07-18 14:34:38 UTC (rev 11061)
@@ -178,7 +178,7 @@
         ),
             DB_FETCHMODE_ASSOC
         );
-        return $result ? $this->_extract_page_data($result) : false;
+        return $result ? $this->_extract_page_data($result) : array();
     }
 
     public function _extract_page_data($data): array
@@ -336,7 +336,7 @@
                     . "  AND pagename='%s'"
                     . "  AND version < %d"
                     . " ORDER BY version DESC",
-                /* Non portable and useless anyway with getOne
+                /* Non-portable and useless anyway with getOne
                 . " LIMIT 1",
                 */
                 $dbh->escapeSimple($pagename),
@@ -596,7 +596,7 @@
         bool   $include_empty = false,
         string $sortby = '',
         string $limit = '',
-        string $exclude = '',
+        $exclude = '',
         bool $want_relations = false
     )
     {
@@ -669,7 +669,7 @@
         bool   $include_empty = false,
         string $sortby = '',
         string $limit = '',
-        string $exclude = ''
+        $exclude = ''
     )
     {
         $dbh = &$this->_dbh;
@@ -1002,7 +1002,7 @@
      * the link database.
      *
      * @param string $pagename Page name.
-     * i.e save_page('') and DELETE nonempty id
+     * i.e. save_page('') and DELETE nonempty id
      * Can be undone and is seen in RecentChanges.
      */
 
@@ -1108,7 +1108,7 @@
      *
      * @see _lock_database
      */
-    public function unlock(array $tables = array(), bool $force = false)
+    public function unlock($tables = array(), bool $force = false)
     {
         if ($this->_lock_count == 0) {
             return;

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2023-07-18 14:15:47 UTC (rev 11060)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2023-07-18 14:34:38 UTC (rev 11061)
@@ -396,7 +396,7 @@
         bool   $include_empty = false,
         string $sortby = '',
         string $limit = '',
-        string $exclude = ''
+        $exclude = ''
     )
     {
         $dbh = &$this->_dbh;

Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2023-07-18 14:15:47 UTC (rev 11060)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2023-07-18 14:34:38 UTC (rev 11061)
@@ -422,7 +422,11 @@
         return $count;
     }
 
-    public function get_all_pages(bool $include_empty = false, string $sortby = '', string $limit = '', string $exclude = '')
+    public function get_all_pages(
+        bool $include_empty = false,
+        string $sortby = '',
+        string $limit = '',
+        $exclude = '')
     {
         $pagedb = &$this->_pagedb;
         $pages = array();

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2023-07-18 14:15:47 UTC (rev 11060)
+++ trunk/lib/WikiDB/backend/file.php	2023-07-18 14:34:38 UTC (rev 11061)
@@ -648,7 +648,7 @@
         bool   $include_empty = false,
         string $sortby = '',
         string $limit = '',
-        string $exclude = ''
+        $exclude = ''
     )
     {
         require_once 'lib/PageList.php';

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