mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-26 09:44:26 +02:00
Code Issues Releases Wiki Activity

[feature/soft-delete] Fix some more usages of _approved column names

Browse Source 
PHPBB3-9657
This commit is contained in:
Joas Schilling
2012-08-30 22:57:00 +02:00
parent 625e7ef58a
commit c03d692a98
5 changed files with 16 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/viewforum.php
View File

@@ -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;
}