diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-14 11:33:24 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-14 11:33:24 -0600 |
| commit | d2187424da6ff2e0d4a69a6e21bac7e92f68335a (patch) | |
| tree | ee099178886dd3a6e737f2dee08bd6312bf25ce1 /phpBB/feed.php | |
| parent | 7948aaa78ed7e543a0773ee1a858ef45f5e5a5bf (diff) | |
| parent | 9c28470ad7b45c10ce3a32065650e4b17f9f27ea (diff) | |
| download | forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar.gz forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar.bz2 forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar.xz forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/common.php
phpBB/config/services.yml
Diffstat (limited to 'phpBB/feed.php')
| -rw-r--r-- | phpBB/feed.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php index 58ae251089..0dce22fb0c 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -555,12 +555,6 @@ class phpbb_feed_base $forum_ids = array_flip($this->get_moderator_approve_forums()); } - if (!$forum_id) - { - // Global announcement, your a moderator in any forum than it's okay. - return (!empty($forum_ids)) ? true : false; - } - return (isset($forum_ids[$forum_id])) ? true : false; } |