summaryrefslogtreecommitdiff
path: root/includes/pager.inc
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-11 16:43:11 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-11 16:43:11 +0000
commit82f604753e281a9d2d5a10c41e4c29678b37eac8 (patch)
tree9bf0171c1d18cb4413b896eb0c9ea7cff0069e95 /includes/pager.inc
parent84afe0d9275834a716edd826e8224e40cafa3746 (diff)
downloadbrdo-82f604753e281a9d2d5a10c41e4c29678b37eac8.tar.gz
brdo-82f604753e281a9d2d5a10c41e4c29678b37eac8.tar.bz2
#514914 by Gábor Hojtsy: Add back removed pager_limits variable.
Diffstat (limited to 'includes/pager.inc')
-rw-r--r--includes/pager.inc6
1 files 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);
}