diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 14:29:21 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 14:29:21 +0100 |
| commit | c865146065fa469fd6416e416d2bf09ff632bf19 (patch) | |
| tree | 9df15a44601601e2ec3f782789af3abba39be386 | |
| parent | 019e43bc2df44cd9282b381733c00afd79dea921 (diff) | |
| parent | 2d989d4322be484e4d855ad650b9f5e606e690b8 (diff) | |
| download | forums-c865146065fa469fd6416e416d2bf09ff632bf19.tar forums-c865146065fa469fd6416e416d2bf09ff632bf19.tar.gz forums-c865146065fa469fd6416e416d2bf09ff632bf19.tar.bz2 forums-c865146065fa469fd6416e416d2bf09ff632bf19.tar.xz forums-c865146065fa469fd6416e416d2bf09ff632bf19.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10435] Readd local announcements to total topic count in viewforum
| -rw-r--r-- | phpBB/viewforum.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 454dc3eaee..96286962e6 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -567,10 +567,13 @@ if ($s_display_active) $topics_count = 1; } +// We need to readd the local announcements to the forums total topic count, otherwise the number is different from the one on the forum list +$total_topic_count = $topics_count + sizeof($announcement_list) - sizeof($global_announce_list); + $template->assign_vars(array( 'PAGINATION' => generate_pagination(append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '')), $topics_count, $config['topics_per_page'], $start), 'PAGE_NUMBER' => on_page($topics_count, $config['topics_per_page'], $start), - 'TOTAL_TOPICS' => ($s_display_active) ? false : (($topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $topics_count))) + 'TOTAL_TOPICS' => ($s_display_active) ? false : (($total_topic_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $total_topic_count))) ); $topic_list = ($store_reverse) ? array_merge($announcement_list, array_reverse($topic_list)) : array_merge($announcement_list, $topic_list); |