1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 05:20:56 +02:00

Merge branch 'develop-olympus' into develop

Conflicts:
	phpBB/includes/functions.php
This commit is contained in:
Joas Schilling
2011-10-13 14:46:16 +02:00
2 changed files with 3 additions and 3 deletions

View File

@@ -655,7 +655,7 @@ function topic_generate_pagination($replies, $url)
$pagination .= '<a href="' . $url . ($j == 0 ? '' : '&amp;start=' . $j) . '">' . $times . '</a>';
if ($times == 1 && $total_pages > 5)
{
$pagination .= ' ... ';
$pagination .= '<span class="page-dots"> ... </span>';
// Display the last three pages
$times = $total_pages - 3;