diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-08-30 22:57:00 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-08-30 22:57:00 +0200 |
| commit | c03d692a98fafa921a832e063c76a3d844632ca7 (patch) | |
| tree | 68111ed107e013d0264a87fce0826fd5706e3167 /phpBB/viewforum.php | |
| parent | 625e7ef58aab1b2d61505f756d53c7d85d9f2d2b (diff) | |
| download | forums-c03d692a98fafa921a832e063c76a3d844632ca7.tar forums-c03d692a98fafa921a832e063c76a3d844632ca7.tar.gz forums-c03d692a98fafa921a832e063c76a3d844632ca7.tar.bz2 forums-c03d692a98fafa921a832e063c76a3d844632ca7.tar.xz forums-c03d692a98fafa921a832e063c76a3d844632ca7.zip | |
[feature/soft-delete] Fix some more usages of _approved column names
PHPBB3-9657
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 4f1f30d1bf..30e0781da9 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -406,9 +406,10 @@ 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'])) + 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']))) { - // Do not display announcements that are waiting for approval. + // Do not display announcements that are waiting for approval or soft deleted. continue; } |