diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2011-11-11 14:06:02 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2011-11-11 14:06:02 +0100 |
| commit | 0d3e9bf446f93afcb4537d561de665c678a44c2a (patch) | |
| tree | 3a064deb539399c92d38538609292347bd259f48 /phpBB/viewforum.php | |
| parent | 86f8851c403bb9f31b43a9656e844e5c925da19a (diff) | |
| download | forums-0d3e9bf446f93afcb4537d561de665c678a44c2a.tar forums-0d3e9bf446f93afcb4537d561de665c678a44c2a.tar.gz forums-0d3e9bf446f93afcb4537d561de665c678a44c2a.tar.bz2 forums-0d3e9bf446f93afcb4537d561de665c678a44c2a.tar.xz forums-0d3e9bf446f93afcb4537d561de665c678a44c2a.zip | |
[ticket/10435] Readd local announcements to total topic count in viewforum
We need to readd the local announcements to the forums total topic count,
otherwise the number is different from the one in the forum list.
PHPBB3-10435
Diffstat (limited to 'phpBB/viewforum.php')
| -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 e0b51bf782..31096d42f5 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -533,10 +533,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); |