diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 14:31:33 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 14:31:33 +0100 |
| commit | 526fca73e7397246bc9090fc80f0d04c69451953 (patch) | |
| tree | 8e0155051904c9fe03b2d3457af73343a53c31c4 /phpBB/viewforum.php | |
| parent | c865146065fa469fd6416e416d2bf09ff632bf19 (diff) | |
| parent | 6a379f1a55eaaf4a32ab357bd9a69bfee2e6d069 (diff) | |
| download | forums-526fca73e7397246bc9090fc80f0d04c69451953.tar forums-526fca73e7397246bc9090fc80f0d04c69451953.tar.gz forums-526fca73e7397246bc9090fc80f0d04c69451953.tar.bz2 forums-526fca73e7397246bc9090fc80f0d04c69451953.tar.xz forums-526fca73e7397246bc9090fc80f0d04c69451953.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/develop/10435' into develop
* nickvergessen/ticket/develop/10435:
[ticket/10435] Remove global announcement from forums total topic count
Conflicts:
phpBB/viewforum.php
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 96286962e6..93d856f620 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -567,8 +567,9 @@ 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); +// 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); $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), |