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

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

Revision: 10285
          http://sourceforge.net/p/phpwiki/code/10285
Author:   vargenau
Date:     2021-06-16 15:49:41 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
Remove "limit_by_db"

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2021-06-16 15:48:56 UTC (rev 10284)
+++ trunk/lib/PageList.php	2021-06-16 15:49:41 UTC (rev 10285)
@@ -945,7 +945,7 @@
                 $this->addPage($page);
             }
         }
-        if (!is_array($page_iter->_options) || !array_key_exists('limit_by_db', $page_iter->_options) || !$page_iter->_options['limit_by_db'])
+        if (!is_array($page_iter->_options))
             $this->_options['slice'] = 1;
         if ($i and empty($this->_options['count']))
             $this->_options['count'] = $i;

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2021-06-16 15:48:56 UTC (rev 10284)
+++ trunk/lib/WikiDB/backend/PearDB.php	2021-06-16 15:49:41 UTC (rev 10285)
@@ -652,10 +652,8 @@
             // extract from,count from limit
             list($from, $count) = $this->limit($limit);
             $result = $dbh->limitQuery($sql, $from, $count);
-            $options = array('limit_by_db' => 1);
         } else {
             $result = $dbh->query($sql);
-            $options = array('limit_by_db' => 0);
         }
         return new WikiDB_backend_PearDB_iter($this, $result, $options);
     }

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2021-06-16 15:48:56 UTC (rev 10284)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2021-06-16 15:49:41 UTC (rev 10285)
@@ -414,10 +414,8 @@
             // extract from,count from limit
             list($from, $count) = $this->limit($limit);
             $result = $dbh->limitQuery($sql, $from, $count);
-            $options = array('limit_by_db' => 1);
         } else {
             $result = $dbh->query($sql);
-            $options = array('limit_by_db' => 0);
         }
         return new WikiDB_backend_PearDB_iter($this, $result, $options);
     }

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-06-16 15:48:56 UTC (rev 10284)
+++ trunk/lib/WikiDB.php	2021-06-16 15:49:41 UTC (rev 10285)
@@ -320,9 +320,8 @@
             $exclude);
         return new WikiDB_PageIterator($this, $result,
             array('include_empty' => $include_empty,
-                'exclude' => $exclude,
-                'limit_by_db' => $result->_options['limit_by_db'],
-                'limit' => $result->limit()));
+                  'exclude' => $exclude,
+                  'limit' => $result->limit()));
     }
 
     /**

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