diff --git a/lib/Doctrine/Pager.php b/lib/Doctrine/Pager.php index 2b21f8195..df5ca9a78 100644 --- a/lib/Doctrine/Pager.php +++ b/lib/Doctrine/Pager.php @@ -184,8 +184,7 @@ class Doctrine_Pager { $this->lastPage = $page; - if ($this->getPage() > $page) - { + if ($this->getPage() > $page) { $this->_setPage($page); } } @@ -346,7 +345,7 @@ class Doctrine_Pager protected function setQuery($query) { if (is_string($query)) { - $query = Doctrine_Query::create()->from($query); + $query = Doctrine_Query::create()->parseQuery($query); } $this->query = $query; diff --git a/lib/Doctrine/Pager/Range/Jumping.php b/lib/Doctrine/Pager/Range/Jumping.php index e44b9bb4f..daec992b3 100644 --- a/lib/Doctrine/Pager/Range/Jumping.php +++ b/lib/Doctrine/Pager/Range/Jumping.php @@ -102,7 +102,7 @@ class Doctrine_Pager_Range_Jumping extends Doctrine_Pager_Range $endPage = ($startPage + $this->getChunkLength()) - 1; // Check for EndPage out-range - if ( $endPage > $pager->getLastPage() ) { + if ($endPage > $pager->getLastPage()) { $endPage = $pager->getLastPage(); }