From 4f9885acf4c0f024102cd555feec1948d5dfbdb8 Mon Sep 17 00:00:00 2001 From: daften Date: Fri, 22 Apr 2011 15:56:06 +0200 Subject: [PATCH] Fixed #1133880 by daften: Setting limit false on pager would not give results instead of all results --- includes/pager.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/pager.inc b/includes/pager.inc index 1269298..b27e385 100644 --- a/includes/pager.inc +++ b/includes/pager.inc @@ -68,7 +68,7 @@ class PagerDefault extends SelectQueryExtender { // A NULL limit is the "kill switch" for pager queries. if (empty($this->limit)) { - return; + return $this->query->execute(); } $this->ensureElement(); @@ -279,7 +279,7 @@ function pager_default_initialize($total, $limit, $element = 0) { // We calculate the total of pages as ceil(items / limit). $pager_total_items[$element] = $total; - $pager_total[$element] = ceil($pager_total_items[$element] / $limit); + $pager_total[$element] = $limit ? ceil($pager_total_items[$element] / $limit) : 1; $pager_page_array[$element] = max(0, min($page, ((int) $pager_total[$element]) - 1)); $pager_limits[$element] = $limit; return $pager_page_array[$element]; -- 1.7.3.5