aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2011-11-01 18:43:24 +0100
committerJoas Schilling <nickvergessen@gmx.de>2011-11-13 15:33:47 +0100
commit91155d1330f04b9be1a7722ef0335ba87fd11cbc (patch)
tree641682e407d4820d56f06f5e829de46e3ebeef4e /phpBB/viewforum.php
parent86f8851c403bb9f31b43a9656e844e5c925da19a (diff)
downloadforums-91155d1330f04b9be1a7722ef0335ba87fd11cbc.tar
forums-91155d1330f04b9be1a7722ef0335ba87fd11cbc.tar.gz
forums-91155d1330f04b9be1a7722ef0335ba87fd11cbc.tar.bz2
forums-91155d1330f04b9be1a7722ef0335ba87fd11cbc.tar.xz
forums-91155d1330f04b9be1a7722ef0335ba87fd11cbc.zip
[ticket/10437] Do not display announcements that are waiting for approval
PHPBB3-10437
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index e0b51bf782..215911c8cb 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -376,6 +376,12 @@ if ($forum_data['forum_type'] == FORUM_POST)
while ($row = $db->sql_fetchrow($result))
{
+ if (!$row['topic_approved'] && !$auth->acl_get('m_approve', $row['forum_id']))
+ {
+ // Do not display announcements that are waiting for approval.
+ continue;
+ }
+
$rowset[$row['topic_id']] = $row;
$announcement_list[] = $row['topic_id'];