From 82f604753e281a9d2d5a10c41e4c29678b37eac8 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Tue, 11 Aug 2009 16:43:11 +0000 Subject: =?UTF-8?q?#514914=20by=20G=C3=A1bor=20Hojtsy:=20Add=20back=20remo?= =?UTF-8?q?ved=20pager=5Flimits=20variable.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/pager.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/pager.inc b/includes/pager.inc index aba3db575..2b6a03291 100644 --- a/includes/pager.inc +++ b/includes/pager.inc @@ -50,7 +50,7 @@ class PagerDefault extends SelectQueryExtender { * to it. */ public function execute() { - global $pager_page_array, $pager_total, $pager_total_items; + global $pager_page_array, $pager_total, $pager_total_items, $pager_limits; // A NULL limit is the "kill switch" for pager queries. if (empty($this->limit)) { @@ -71,6 +71,7 @@ class PagerDefault extends SelectQueryExtender { $pager_total_items[$this->element] = $this->getCountQuery()->execute()->fetchField(); $pager_total[$this->element] = ceil($pager_total_items[$this->element] / $this->limit); $pager_page_array[$this->element] = max(0, min((int)$pager_page_array[$this->element], ((int)$pager_total[$this->element]) - 1)); + $pager_limits[$this->element] = $this->limit; $this->range($pager_page_array[$this->element] * $this->limit, $this->limit); // Now that we've added our pager-based range instructions, run the query normally. @@ -197,7 +198,7 @@ class PagerDefault extends SelectQueryExtender { * @ingroup database */ function pager_query($query, $limit = 10, $element = 0, $count_query = NULL) { - global $pager_page_array, $pager_total, $pager_total_items; + global $pager_page_array, $pager_total, $pager_total_items, $pager_limits; $page = isset($_GET['page']) ? $_GET['page'] : ''; // Substitute in query arguments. @@ -220,6 +221,7 @@ function pager_query($query, $limit = 10, $element = 0, $count_query = NULL) { $pager_total_items[$element] = db_query($count_query, $args)->fetchField(); $pager_total[$element] = ceil($pager_total_items[$element] / $limit); $pager_page_array[$element] = max(0, min((int)$pager_page_array[$element], ((int)$pager_total[$element]) - 1)); + $pager_limits[$element] = $limit; return db_query_range($query, $args, $pager_page_array[$element] * $limit, $limit); } -- cgit v1.2.3