summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/pager.inc16
1 files changed, 4 insertions, 12 deletions
diff --git a/includes/pager.inc b/includes/pager.inc
index 040e955ac..3ffb276a8 100644
--- a/includes/pager.inc
+++ b/includes/pager.inc
@@ -69,18 +69,10 @@ function pager_query($query, $limit = 10, $element = 0, $count_query = NULL) {
$pager_page_array = explode(',', $page);
// We calculate the total of pages as ceil(items / limit).
- if (count($args)) {
- $pager_total_items[$element] = db_result(db_query($count_query, $args));
- $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));
- return db_query_range($query, $args, $pager_page_array[$element] * $limit, $limit);
- }
- else {
- $pager_total_items[$element] = db_result(db_query($count_query));
- $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));
- return db_query_range($query, $pager_page_array[$element] * $limit, $limit);
- }
+ $pager_total_items[$element] = db_result(db_query($count_query, $args));
+ $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));
+ return db_query_range($query, $args, $pager_page_array[$element] * $limit, $limit);
}
/**