diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-08-16 19:52:37 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-08-16 19:52:37 +0000 |
| commit | b31b892900e7cd4d5ac9d65039356037761af264 (patch) | |
| tree | b8832d5a273ef230c609a18f6e7ee46823899d2f /includes/pager.inc | |
| parent | 3ace12caf8f4d46fda44b79b4a3cbe91b0bca5c0 (diff) | |
| download | brdo-b31b892900e7cd4d5ac9d65039356037761af264.tar.gz brdo-b31b892900e7cd4d5ac9d65039356037761af264.tar.bz2 | |
- Patch #78364 by chx: remove pager cruft.
Diffstat (limited to 'includes/pager.inc')
| -rw-r--r-- | includes/pager.inc | 16 |
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); } /** |