diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 14:57:26 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 14:57:26 -0500 |
| commit | 94b3d3839218135ddc6a24c432b4459943222bcb (patch) | |
| tree | 41b863bec4528b2cc7796f1023e52f375a3234cc /phpBB/includes/mcp/mcp_pm_reports.php | |
| parent | e3dfe4f0465208fef525b20fcf1c630154514415 (diff) | |
| parent | 4d14bdbf1307e020533dbe816a0754b049fe1657 (diff) | |
| download | forums-94b3d3839218135ddc6a24c432b4459943222bcb.tar forums-94b3d3839218135ddc6a24c432b4459943222bcb.tar.gz forums-94b3d3839218135ddc6a24c432b4459943222bcb.tar.bz2 forums-94b3d3839218135ddc6a24c432b4459943222bcb.tar.xz forums-94b3d3839218135ddc6a24c432b4459943222bcb.zip | |
Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
* remotes/upstream/develop-olympus:
[ticket/11829] Use report_closed to determine status in MCP report_details
Conflicts:
phpBB/styles/prosilver/template/mcp_post.html
Diffstat (limited to 'phpBB/includes/mcp/mcp_pm_reports.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_pm_reports.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php index cb61b25174..f0452b37a5 100644 --- a/phpBB/includes/mcp/mcp_pm_reports.php +++ b/phpBB/includes/mcp/mcp_pm_reports.php @@ -161,6 +161,7 @@ class mcp_pm_reports 'S_CLOSE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports&mode=pm_report_details&r=' . $report_id), 'S_CAN_VIEWIP' => $auth->acl_getf_global('m_info'), 'S_POST_REPORTED' => $pm_info['message_reported'], + 'S_REPORT_CLOSED' => $report['report_closed'], 'S_USER_NOTES' => true, 'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports&mode=pm_report_details&r=' . $report_id), |