aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-04-22 15:27:40 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-04-22 15:27:40 +0000
commit550f270a0027e67a0eb19d99fbe54d6045696a0b (patch)
treec0a38cbb0715d7a17b7226c134568d9392e550da /phpBB/viewforum.php
parent782c536c703959c643dc77b846c9617326b2a98e (diff)
downloadforums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar
forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar.gz
forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar.bz2
forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar.xz
forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.zip
#10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, #9831, #9830, #9815, #9665, #9624
prosilver adjustments for important announcements in ucp - #9995 MCP fixes for user notes/warnings - #9981 Preserving imageset values on save/edit find a member link for Mass PM's - #9925 syndicate window.onload events where necessary - #9878 Duplicate topics in forums with announcements - #9840 Email template for forced re-activation - #9808 Topic pagination adjustment - #9763 Changed compose message layout in UCP - #9706, #9702 Fixed inline attachment font size (hopefully) git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 15b6eac31b..ab5150bf8d 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -347,6 +347,10 @@ if ($forum_data['forum_type'] == FORUM_POST)
{
$global_announce_list[$row['topic_id']] = true;
}
+ else
+ {
+ $topics_count--;
+ }
}
$db->sql_freeresult($result);
}