aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-11-11 13:59:11 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-11-11 13:59:11 +0100
commit504158ceaba18bb8bc61d54504a2c870d0eb0407 (patch)
treede17deea480712c2ab9677da6ede0ab5ed9879df
parente86ecc0f3bd6383d31a670896720a970b8faaaa9 (diff)
parentf2cb4e191139d0c7b6de9b06b2558ce14b881b90 (diff)
downloadforums-504158ceaba18bb8bc61d54504a2c870d0eb0407.tar
forums-504158ceaba18bb8bc61d54504a2c870d0eb0407.tar.gz
forums-504158ceaba18bb8bc61d54504a2c870d0eb0407.tar.bz2
forums-504158ceaba18bb8bc61d54504a2c870d0eb0407.tar.xz
forums-504158ceaba18bb8bc61d54504a2c870d0eb0407.zip
Merge remote-tracking branch 'nickvergessen/ticket/11077' into develop
* nickvergessen/ticket/11077: [ticket/11077] Remove code from old global announcements system
-rw-r--r--phpBB/feed.php6
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;
}