diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-05-25 05:42:05 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-05-25 05:42:05 +0000 |
| commit | 753bc588d9e8a04ba626d272f1eb246fc802f794 (patch) | |
| tree | 11d75eac5ff2fdb1fbc44a7c41ce0f85efd78801 /includes/pager.inc | |
| parent | 48d3ef604073048a18244726a73793dbbe9dab7f (diff) | |
| download | brdo-753bc588d9e8a04ba626d272f1eb246fc802f794.tar.gz brdo-753bc588d9e8a04ba626d272f1eb246fc802f794.tar.bz2 | |
- Fix mistakes in pager patch.
Diffstat (limited to 'includes/pager.inc')
| -rw-r--r-- | includes/pager.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/pager.inc b/includes/pager.inc index cc7464dbe..491e35cc5 100644 --- a/includes/pager.inc +++ b/includes/pager.inc @@ -72,13 +72,13 @@ function pager_query($query, $limit = 10, $element = 0, $count_query = NULL) { 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_total[$element]) - 1)); + $pager_page_array[$element] = max(0, min($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_total[$element]) - 1)); + $pager_page_array[$element] = max(0, min($pager_page_array[$element], ((int)$pager_total[$element]) - 1)); return db_query_range($query, $pager_page_array[$element] * $limit, $limit); } } @@ -384,7 +384,7 @@ function theme_pager_list($limit, $element = 0, $quantity = 5, $text = '', $attr * @return * An HTML string that generates the link. */ -function theme_pager_link($page_new, $element, $attributes = array()) { +function theme_pager_link($text, $page_new, $element, $attributes = array()) { $q = $_GET['q']; $page = array_key_exists('page', $_GET) ? $_GET['page'] : ''; |