aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_reports.php
diff options
context:
space:
mode:
authorBruno Ais <brunoaiss@gmail.com>2012-01-25 14:30:52 +0000
committerOleg Pudeyev <oleg@bsdpower.com>2012-03-19 08:27:31 -0400
commit95b5109c622f8acd2d57343b97e3c2b6b157863a (patch)
treecf73f29660c54932fba72741f3726f175708fdbd /phpBB/includes/mcp/mcp_reports.php
parent1fa39ea722ab8e27402d3db67d5f11587570a96d (diff)
downloadforums-95b5109c622f8acd2d57343b97e3c2b6b157863a.tar
forums-95b5109c622f8acd2d57343b97e3c2b6b157863a.tar.gz
forums-95b5109c622f8acd2d57343b97e3c2b6b157863a.tar.bz2
forums-95b5109c622f8acd2d57343b97e3c2b6b157863a.tar.xz
forums-95b5109c622f8acd2d57343b97e3c2b6b157863a.zip
[feature/save-post-on-report] The complete changes for this feature
This covers all the changes so that when a report is made, the post itself is copied and displayed in the MCP instead of the current post. Unfortunatly, I made all commits in the wrong way and they were lost. Now I have only the final files.
Diffstat (limited to 'phpBB/includes/mcp/mcp_reports.php')
-rw-r--r--phpBB/includes/mcp/mcp_reports.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 95e84e816b..c848175c79 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -71,7 +71,7 @@ class mcp_reports
// closed reports are accessed by report id
$report_id = request_var('r', 0);
- $sql = 'SELECT r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour
+ $sql = 'SELECT r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, r.reported_text, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour
FROM ' . REPORTS_TABLE . ' r, ' . REPORTS_REASONS_TABLE . ' rr, ' . USERS_TABLE . ' u
WHERE ' . (($report_id) ? 'r.report_id = ' . $report_id : "r.post_id = $post_id") . '
AND rr.reason_id = r.reason_id
@@ -226,7 +226,7 @@ class mcp_reports
'REPORTER_NAME' => get_username_string('username', $report['user_id'], $report['username'], $report['user_colour']),
'U_VIEW_REPORTER_PROFILE' => get_username_string('profile', $report['user_id'], $report['username'], $report['user_colour']),
- 'POST_PREVIEW' => $message,
+ 'POST_PREVIEW' => $report['reported_text'],
'POST_SUBJECT' => ($post_info['post_subject']) ? $post_info['post_subject'] : $user->lang['NO_SUBJECT'],
'POST_DATE' => $user->format_date($post_info['post_time']),
'POST_IP' => $post_info['poster_ip'],