From 29b32eff2b9ad55c5990a3393ef9e55ec8980d67 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 31 Oct 2004 07:59:18 +0000 Subject: - Patch #7161 by jhriggs: fixed probem with 'last page' link not being correct under certain circumstances. --- includes/pager.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'includes') diff --git a/includes/pager.inc b/includes/pager.inc index 913603d7a..279dd3d61 100644 --- a/includes/pager.inc +++ b/includes/pager.inc @@ -202,11 +202,12 @@ function pager_next($text, $limit, $element = 0, $interval = 1, $attributes = ar function pager_last($text, $limit, $element = 0, $attributes = array()) { global $pager_from_array, $pager_total; - $from_new = pager_load_array(($pager_total[$element] - ($pager_total[$element] % $limit)), $element, $pager_from_array); + $last_num = (($pager_total[$element] % $limit) ? ($pager_total[$element] % $limit) : $limit); + $from_new = pager_load_array(($pager_total[$element] - $last_num), $element, $pager_from_array); if ($from_new[$element] < ($pager_from_array[$element] + $limit)) { return pager_next($text, $limit, $element, 1, $attributes); } - if (($from_new[$element] > $pager_from_array[$element]) && ($from_new[$element] > 0) && $from_new[$element] < $pager_total[$element]) { + if (($from_new[$element] > $pager_from_array[$element]) && ($from_new[$element] > 0) && ($from_new[$element] < $pager_total[$element])) { return ''. $text .''; } return ' '; -- cgit v1.2.3