diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-10-11 18:23:12 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-10-11 18:23:12 +0000 |
| commit | 213773e368c9ac51b15216830d74584674c549f2 (patch) | |
| tree | 5dddabfacd0a24460ab9034808e12a888bcc8a8f /phpBB | |
| parent | 853a12cf00ef5d8b1bc1f2590d7b069ce04ac690 (diff) | |
| download | forums-213773e368c9ac51b15216830d74584674c549f2.tar forums-213773e368c9ac51b15216830d74584674c549f2.tar.gz forums-213773e368c9ac51b15216830d74584674c549f2.tar.bz2 forums-213773e368c9ac51b15216830d74584674c549f2.tar.xz forums-213773e368c9ac51b15216830d74584674c549f2.zip | |
Really fix #13970 broken fix in r8853.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9003 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 2 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index a1b8de2c98..b70601b479 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -246,7 +246,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info) 'LAST_POST_SUBJECT' => $row['topic_last_post_subject'], 'LAST_VIEW_TIME' => $user->format_date($row['topic_last_view_time']), - 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $auth->acl_get('m_report', $row['forum_id'])) ? true : false, + 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && empty($row['topic_moved_id']) && $auth->acl_get('m_report', $row['forum_id'])) ? true : false, 'S_TOPIC_UNAPPROVED' => $topic_unapproved, 'S_POSTS_UNAPPROVED' => $posts_unapproved, 'S_UNREAD_TOPIC' => $unread_topic, diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 60a6e39c54..14564ad38c 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -506,9 +506,11 @@ if (sizeof($shadow_topic_list)) 'topic_moved_id' => $rowset[$orig_topic_id]['topic_moved_id'], 'topic_status' => $rowset[$orig_topic_id]['topic_status'], 'topic_type' => $rowset[$orig_topic_id]['topic_type'], - 'topic_reported' => $rowset[$orig_topic_id]['topic_reported'], )); + // Shadow topics are never reported + $row['topic_reported'] = 0; + $rowset[$orig_topic_id] = $row; } $db->sql_freeresult($result); |