diff options
| -rw-r--r-- | phpBB/mcp.php | 14 | ||||
| -rw-r--r-- | phpBB/report.php | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/phpBB/mcp.php b/phpBB/mcp.php index dc0b13c7b9..d1cdaa2aef 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -189,14 +189,18 @@ else // Hide some of the options if we don't have the relevant information to use them if (!$post_id) { - $module->set_display('reports', 'report_details', false); $module->set_display('main', 'post_details', false); $module->set_display('warn', 'warn_post', false); +} - if (!$topic_id || $mode == 'unapproved_posts') - { - $module->set_display('queue', 'approve_details', false); - } +if ($mode == '' || $mode == 'unapproved_topics' || $mode == 'unapproved_posts') +{ + $module->set_display('queue', 'approve_details', false); +} + +if ($mode == '' || $mode == 'reports' || $mode == 'reports_closed') +{ + $module->set_display('reports', 'report_details', false); } if (!$topic_id) diff --git a/phpBB/report.php b/phpBB/report.php index d0584b9d63..cbae24b228 100644 --- a/phpBB/report.php +++ b/phpBB/report.php @@ -132,7 +132,8 @@ if ($submit && $reason_id) { $sql = 'UPDATE ' . TOPICS_TABLE . ' SET topic_reported = 1 - WHERE topic_id = ' . $report_data['topic_id']; + WHERE topic_id = ' . $report_data['topic_id'] . ' + OR topic_moved_id = ' . $report_data['topic_id']; $db->sql_query($sql); } |