Doctrine

Timestamp:

02/20/08 23:15:13 (2 years ago)

Author:

guilhermeblanco

Message:

Fixed method getNextPage that was always returning the last page in all branches

Files:

• branches/0.10/lib/Doctrine/Pager.php (modified) (1 diff)
• branches/0.9/lib/Doctrine/Pager.php (modified) (1 diff)
• trunk/lib/Doctrine/Pager.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Pager.php

@@ -271 +271 @@
     {
         if ($this->getExecuted()) {
-            return $this->_lastPage;
+            return min($this->getPage() + 1, $this->getLastPage());
         }
 
         throw new Doctrine_Pager_Exception(
             'Cannot retrieve the last page number of a not yet executed Pager query'
-        );return min($this->getPage() + 1, $this->getLastPage());
+        );
     }
 

branches/0.9/lib/Doctrine/Pager.php

@@ -271 +271 @@
     {
         if ($this->getExecuted()) {
-            return $this->_lastPage;
+            return min($this->getPage() + 1, $this->getLastPage());
         }
 
         throw new Doctrine_Pager_Exception(
             'Cannot retrieve the last page number of a not yet executed Pager query'
-        );return min($this->getPage() + 1, $this->getLastPage());
+        );
     }
 

trunk/lib/Doctrine/Pager.php

@@ -271 +271 @@
     {
         if ($this->getExecuted()) {
-            return $this->_lastPage;
+            return min($this->getPage() + 1, $this->getLastPage());
         }
 
         throw new Doctrine_Pager_Exception(
             'Cannot retrieve the last page number of a not yet executed Pager query'
-        );return min($this->getPage() + 1, $this->getLastPage());
+        );
     }