makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'nickvergessen/ticket/10437' into develop-olympus

Browse source 
* nickvergessen/ticket/10437:
  [ticket/10437] Do not display announcements that are waiting for approval
This commit is contained in:
Andreas Fischer 2011-11-13 15:35:18 +01:00
commit f00f3ad8ea
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/viewforum.php
View file

@ -376,6 +376,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'];