From 99d026b8945c9b332c49fef79f04cc74331df9c7 Mon Sep 17 00:00:00 2001
From: guilhermeblanco <guilhermeblanco@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 17 Jan 2008 15:33:08 +0000
Subject: [PATCH] Fixed _adjustOffset in order to get it working after previous
 change in Pager

---
 lib/Doctrine/Pager.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib/Doctrine/Pager.php b/lib/Doctrine/Pager.php
index 4022c4064..9f3a359f6 100644
--- a/lib/Doctrine/Pager.php
+++ b/lib/Doctrine/Pager.php
@@ -107,9 +107,9 @@ class Doctrine_Pager
     {
         // retrieve the number of items found
         $count = $this->getCountQuery()->count($this->getCountQueryParams($params));
-        $this->_setNumResults($count);
 
-        $this->_setExecuted(true);
+        $this->_setNumResults($count);
+        $this->_setExecuted(true); // _adjustOffset relies of _executed equals true = getNumResults()
 
         $this->_adjustOffset();
     }
@@ -124,18 +124,16 @@ class Doctrine_Pager
      */
     protected function _adjustOffset()
     {
-        if (!$this->getExecuted()) {
-            // Define new total of pages
-            $this->_setLastPage(
-                max(1, ceil($this->getNumResults() / $this->getMaxPerPage()))
-            );
-            $offset = ($this->getPage() - 1) * $this->getMaxPerPage();
+        // Define new total of pages
+        $this->_setLastPage(
+            max(1, ceil($this->getNumResults() / $this->getMaxPerPage()))
+        );
+        $offset = ($this->getPage() - 1) * $this->getMaxPerPage();
 
-            // Assign new offset and limit to Doctrine_Query object
-            $p = $this->getQuery();
-            $p->offset($offset);
-            $p->limit($this->getMaxPerPage());
-        }
+        // Assign new offset and limit to Doctrine_Query object
+        $p = $this->getQuery();
+        $p->offset($offset);
+        $p->limit($this->getMaxPerPage());
     }