From 12882084d4ce686fe43f3935f16078c4e818cde3 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Tue, 4 Oct 2011 11:55:25 +0300 Subject: [PATCH 1/2] [ticket/10397] Pagination inconsistency fix Fixing inconsistency in code generated by generate_pagination() PHPBB3-10397 --- phpBB/includes/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index c2b099d48a..8017c379f3 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2127,7 +2127,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add $start_cnt = min(max(1, $on_page - 4), $total_pages - 5); $end_cnt = max(min($total_pages, $on_page + 4), 6); - $page_string .= ($start_cnt > 1) ? ' ... ' : $seperator; + $page_string .= ($start_cnt > 1) ? ' ... ' : $seperator; for ($i = $start_cnt + 1; $i < $end_cnt; $i++) { @@ -2138,7 +2138,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add } } - $page_string .= ($end_cnt < $total_pages) ? ' ... ' : $seperator; + $page_string .= ($end_cnt < $total_pages) ? ' ... ' : $seperator; } else { From b38fbc6d25d1f76683acec83627238ed5b5dbf8c Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Tue, 4 Oct 2011 12:24:42 +0300 Subject: [PATCH 2/2] [ticket/10397] Pagination inconsistency fix Fixing topic_generate_pagination() PHPBB3-10397 --- phpBB/includes/functions_display.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 14d0c44dcf..86eabc419c 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -674,7 +674,7 @@ function topic_generate_pagination($replies, $url) $pagination .= '' . $times . ''; if ($times == 1 && $total_pages > 5) { - $pagination .= ' ... '; + $pagination .= ' ... '; // Display the last three pages $times = $total_pages - 3;