diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 15:35:18 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 15:35:18 +0100 |
| commit | f00f3ad8ea7a9e5d66d93ca8bcb77a3e5e5e8971 (patch) | |
| tree | 60f33cad28acd7ba91c0113c29ef1f27bb1060ed | |
| parent | 2d989d4322be484e4d855ad650b9f5e606e690b8 (diff) | |
| parent | 91155d1330f04b9be1a7722ef0335ba87fd11cbc (diff) | |
| download | forums-f00f3ad8ea7a9e5d66d93ca8bcb77a3e5e5e8971.tar forums-f00f3ad8ea7a9e5d66d93ca8bcb77a3e5e5e8971.tar.gz forums-f00f3ad8ea7a9e5d66d93ca8bcb77a3e5e5e8971.tar.bz2 forums-f00f3ad8ea7a9e5d66d93ca8bcb77a3e5e5e8971.tar.xz forums-f00f3ad8ea7a9e5d66d93ca8bcb77a3e5e5e8971.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10437' into develop-olympus
* nickvergessen/ticket/10437:
[ticket/10437] Do not display announcements that are waiting for approval
| -rw-r--r-- | phpBB/viewforum.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index f15fdb8d08..8a6b777bea 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -376,6 +376,12 @@ 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'])) + { + // Do not display announcements that are waiting for approval. + continue; + } + $rowset[$row['topic_id']] = $row; $announcement_list[] = $row['topic_id']; |