diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-04-04 15:33:48 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-04-04 15:33:48 +0200 |
| commit | f8ff68f21d16d583da5c58cef4e961cc226926dd (patch) | |
| tree | 83e3ca4cfba25fe89db2da4d5d031f7eb192dcd8 /phpBB/includes | |
| parent | 382354925d59e3da12781f8877ab0a70d0c434d9 (diff) | |
| parent | 925a135613a80ba9bfc3b26a2524d3c2d3ba77b3 (diff) | |
| download | forums-f8ff68f21d16d583da5c58cef4e961cc226926dd.tar forums-f8ff68f21d16d583da5c58cef4e961cc226926dd.tar.gz forums-f8ff68f21d16d583da5c58cef4e961cc226926dd.tar.bz2 forums-f8ff68f21d16d583da5c58cef4e961cc226926dd.tar.xz forums-f8ff68f21d16d583da5c58cef4e961cc226926dd.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047)
[bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)
[feature/unapproved-posts-in-feed] Little changelog correction
[feature/unapproved-posts-in-feed] Increase performance of is_moderator_approve_forum() as per bantu
[feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed
[bug/58745] Correct changelog message
[bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745)
[bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint
[bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)
[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.php | 2 |
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 . '&start=' . $j . '">' . $times . '</a>'; + $pagination .= '<a href="' . $url . ($j == 0 ? '' : '&start=' . $j) . '">' . $times . '</a>'; if ($times == 1 && $total_pages > 5) { $pagination .= ' ... '; |