diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-09 19:37:47 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-09 19:37:47 +0000 |
| commit | 0cf31f0e2a3ad652b924ac4efbf5d7433c831397 (patch) | |
| tree | 041ebe56fb754ff6ab5ee5b5682e228b7b5848aa /phpBB/mcp.php | |
| parent | 898decd6cc4876269d14071431898fd8f547556e (diff) | |
| download | forums-0cf31f0e2a3ad652b924ac4efbf5d7433c831397.tar forums-0cf31f0e2a3ad652b924ac4efbf5d7433c831397.tar.gz forums-0cf31f0e2a3ad652b924ac4efbf5d7433c831397.tar.bz2 forums-0cf31f0e2a3ad652b924ac4efbf5d7433c831397.tar.xz forums-0cf31f0e2a3ad652b924ac4efbf5d7433c831397.zip | |
Fix the ability to report/view reports and warn in global announcements
git-svn-id: file:///svn/phpbb/trunk@6030 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/mcp.php')
| -rw-r--r-- | phpBB/mcp.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 50b803048c..acff846df7 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -82,7 +82,7 @@ if ($post_id) $db->sql_freeresult($result); $topic_id = (int) $row['topic_id']; - $forum_id = (int) $row['forum_id']; + $forum_id = (int) ($row['forum_id']) ? $row['forum_id'] : $forum_id; } if ($topic_id && !$forum_id) @@ -269,6 +269,12 @@ function get_topic_data($topic_ids, $acl_list = 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'])) @@ -330,6 +336,12 @@ function get_post_data($post_ids, $acl_list = 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; |