diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 15:35:27 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 15:35:27 +0100 |
| commit | ec1445371d0a312a41d9f1137c064b4abfa93bc8 (patch) | |
| tree | 944fd9fa91e254a344beecb9f88da1172f753f8d /phpBB/viewforum.php | |
| parent | 526fca73e7397246bc9090fc80f0d04c69451953 (diff) | |
| parent | f00f3ad8ea7a9e5d66d93ca8bcb77a3e5e5e8971 (diff) | |
| download | forums-ec1445371d0a312a41d9f1137c064b4abfa93bc8.tar forums-ec1445371d0a312a41d9f1137c064b4abfa93bc8.tar.gz forums-ec1445371d0a312a41d9f1137c064b4abfa93bc8.tar.bz2 forums-ec1445371d0a312a41d9f1137c064b4abfa93bc8.tar.xz forums-ec1445371d0a312a41d9f1137c064b4abfa93bc8.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10437] Do not display announcements that are waiting for approval
Diffstat (limited to 'phpBB/viewforum.php')
| -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 93d856f620..caed794671 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -391,6 +391,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']; |