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

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10437] Do not display announcements that are waiting for approval
This commit is contained in:
Andreas Fischer
2011-11-13 15:35:27 +01:00
parent 526fca73e7 f00f3ad8ea
commit ec1445371d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/viewforum.php
View File

@ -391,6 +391,12 @@ if ($forum_data['forum_type'] == FORUM_POST)
while ($row = $db->sql_fetchrow($result)) 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; $rowset[$row['topic_id']] = $row;
$announcement_list[] = $row['topic_id']; $announcement_list[] = $row['topic_id'];