aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-04-04 15:32:36 +0200
committerNils Adermann <naderman@naderman.de>2010-04-04 15:32:36 +0200
commit925a135613a80ba9bfc3b26a2524d3c2d3ba77b3 (patch)
tree36f31fc9a6c7d173e17566f9c2f584d56bc62102 /phpBB/includes
parent560a1b3ad44386dd6c285d0a5209390c2b9e2f1f (diff)
parent492063cec63fe3665406a74e74265c1a7dd5c295 (diff)
downloadforums-925a135613a80ba9bfc3b26a2524d3c2d3ba77b3.tar
forums-925a135613a80ba9bfc3b26a2524d3c2d3ba77b3.tar.gz
forums-925a135613a80ba9bfc3b26a2524d3c2d3ba77b3.tar.bz2
forums-925a135613a80ba9bfc3b26a2524d3c2d3ba77b3.tar.xz
forums-925a135613a80ba9bfc3b26a2524d3c2d3ba77b3.zip
Merge branch 'bug/cs278/59465' into develop-olympus
* bug/cs278/59465: [bug/59465] Remove start=0 from topic pagination links. [bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_display.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index f49aa42324..ea77551fc4 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -660,7 +660,7 @@ function topic_generate_pagination($replies, $url)
$times = 1;
for ($j = 0; $j < $replies + 1; $j += $per_page)
{
- $pagination .= '<a href="' . $url . '&amp;start=' . $j . '">' . $times . '</a>';
+ $pagination .= '<a href="' . $url . ($j == 0 ? '' : '&amp;start=' . $j) . '">' . $times . '</a>';
if ($times == 1 && $total_pages > 5)
{
$pagination .= ' ... ';