diff options
| author |   Joas Schilling <nickvergessen@gmx.de> | 2010-03-11 00:38:56 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2011-04-07 13:45:44 +0200 |
| commit | 3352141264993982215b714ac7a128854494ac1f (patch) | |
| tree | 1fc4a4d85919402e957b1ce6448764aad791bc0d /phpBB/mcp.php | |
| parent | Merge branch 'develop-olympus' into develop (diff) | |
| download | phpbb-3352141264993982215b714ac7a128854494ac1f.tar.gz phpbb-3352141264993982215b714ac7a128854494ac1f.tar.bz2 phpbb-3352141264993982215b714ac7a128854494ac1f.zip | |
[ticket/9684] Remove code for global announcement in root-files
PHPBB3-9684
Diffstat (limited to 'phpBB/mcp.php')
| -rw-r--r-- | phpBB/mcp.php | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 401a12d0f9..0029d224cd 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -85,7 +85,7 @@ if ($post_id) $db->sql_freeresult($result); $topic_id = (int) $row['topic_id']; - $forum_id = (int) ($row['forum_id']) ? $row['forum_id'] : $forum_id; + $forum_id = (int) $row['forum_id']; } else if ($topic_id) { @@ -400,12 +400,6 @@ function get_topic_data($topic_ids, $acl_list = false, $read_tracking = false) while ($row = $db->sql_fetchrow($result)) { - if (!$row['forum_id']) - { - // Global Announcement? - $row['forum_id'] = request_var('f', 0); - } - $rowset[$row['topic_id']] = $row; if ($acl_list && !$auth->acl_gets($acl_list, $row['forum_id'])) @@ -485,12 +479,6 @@ function get_post_data($post_ids, $acl_list = false, $read_tracking = false) while ($row = $db->sql_fetchrow($result)) { - if (!$row['forum_id']) - { - // Global Announcement? - $row['forum_id'] = request_var('f', 0); - } - if ($acl_list && !$auth->acl_gets($acl_list, $row['forum_id'])) { continue; |