1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 02:36:38 +02:00

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
This commit is contained in:
Graham Eames
2006-06-09 19:37:47 +00:00
parent 898decd6cc
commit 0cf31f0e2a
5 changed files with 33 additions and 17 deletions

View File

@@ -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;