aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-07-12 07:24:35 -0400
committerJoas Schilling <nickvergessen@gmx.de>2013-07-12 07:24:35 -0400
commite1bf87844b09e1359088ee55e4d500af97179926 (patch)
tree4fe1768c0abd11e7ba1353f55a6abb85972afb7f /phpBB/viewforum.php
parentd43645adfa182d609b3a0c27e329c97642d16fcd (diff)
downloadforums-e1bf87844b09e1359088ee55e4d500af97179926.tar
forums-e1bf87844b09e1359088ee55e4d500af97179926.tar.gz
forums-e1bf87844b09e1359088ee55e4d500af97179926.tar.bz2
forums-e1bf87844b09e1359088ee55e4d500af97179926.tar.xz
forums-e1bf87844b09e1359088ee55e4d500af97179926.zip
[ticket/9657] Remove last references to m_restore permission
PHPBB3-9657
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 926670f9bf..06af674ee6 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -423,8 +423,7 @@ if ($forum_data['forum_type'] == FORUM_POST)
while ($row = $db->sql_fetchrow($result))
{
- if (($row['topic_visibility'] == ITEM_UNAPPROVED && !$auth->acl_get('m_approve', $row['forum_id']))
- && ($row['topic_visibility'] == ITEM_DELETED && !$auth->acl_get('m_restore', $row['forum_id'])))
+ if ($row['topic_visibility'] != ITEM_APPROVED && !$auth->acl_get('m_approve', $row['forum_id']))
{
// Do not display announcements that are waiting for approval or soft deleted.
continue;