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

Merge remote-tracking branch 'nickvergessen/ticket/develop/10435' into develop

Browse source 
* nickvergessen/ticket/develop/10435:
  [ticket/10435] Remove global announcement from forums total topic count

Conflicts:
	phpBB/viewforum.php
This commit is contained in:
Andreas Fischer 2011-11-13 14:31:33 +01:00
commit 526fca73e7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/viewforum.php
View file

@ -567,8 +567,9 @@ if ($s_display_active)
$topics_count = 1; $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 // We need to remove the global announcements from the forums total topic count,
$total_topic_count = $topics_count + sizeof($announcement_list) - sizeof($global_announce_list); // otherwise the number is different from the one on the forum list
$total_topic_count = $topics_count - sizeof($global_announce_forums);
$template->assign_vars(array( $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), '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),