makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10435] Remove global announcement from forums total topic count

Browse source 
We need to remove the global announcements from the forums total topic count,
otherwise the number is different from the one on the forum list.

PHPBB3-10435
This commit is contained in:
Joas Schilling 2011-11-11 14:11:00 +01:00
parent 72a3bcd048
commit 6a379f1a55
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/viewforum.php
View file

@ -561,6 +561,9 @@ if (sizeof($shadow_topic_list))
}
unset($shadow_topic_list);
// We need to remove the global announcements from the forums total topic count, otherwise the number is different from the one on the forum list
$total_topics_count = $topics_count - sizeof($global_announce_forums);
// Ok, adjust topics count for active topics list
if ($s_display_active)
{
@ -570,7 +573,7 @@ if ($s_display_active)
$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_topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $total_topics_count)))
);
$topic_list = ($store_reverse) ? array_merge($announcement_list, array_reverse($topic_list)) : array_merge($announcement_list, $topic_list);