diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-29 13:08:23 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-29 13:42:42 +0100 |
| commit | 9ee177573dc838bf0c1cf800c72667a35af828e7 (patch) | |
| tree | 6460a4647e273f7922dc99032022052bf60ca87a | |
| parent | ae6a3b03c4c0c46679cc60f597b1c425783cfcaf (diff) | |
| download | forums-9ee177573dc838bf0c1cf800c72667a35af828e7.tar forums-9ee177573dc838bf0c1cf800c72667a35af828e7.tar.gz forums-9ee177573dc838bf0c1cf800c72667a35af828e7.tar.bz2 forums-9ee177573dc838bf0c1cf800c72667a35af828e7.tar.xz forums-9ee177573dc838bf0c1cf800c72667a35af828e7.zip | |
[ticket/13241] Fix pagination with global announcements
PHPBB3-13241
| -rw-r--r-- | phpBB/viewforum.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index d881bb88b2..1f455494f7 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -694,10 +694,10 @@ if ($s_display_active) // 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_topic_count = $topics_count - sizeof($global_announce_forums); +$total_topic_count = $topics_count - sizeof($announcement_list); $base_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '')); -$pagination->generate_template_pagination($base_url, 'pagination', 'start', $topics_count, $config['topics_per_page'], $start); +$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_topic_count, $config['topics_per_page'], $start); $template->assign_vars(array( 'TOTAL_TOPICS' => ($s_display_active) ? false : $user->lang('VIEW_FORUM_TOPICS', (int) $total_topic_count), |