aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-09-12 12:53:06 -0700
committerNathan Guse <nathaniel.guse@gmail.com>2013-09-12 12:53:06 -0700
commit4d14bdbf1307e020533dbe816a0754b049fe1657 (patch)
treec4dab590f506ca4048dd5975d37bb5bcb2e25121 /phpBB/includes/mcp
parentc1557cf78d7463f9b92047a4a908e7287606a9d7 (diff)
parent77845e366e8a5578ad740186cf71d75be32694bc (diff)
downloadforums-4d14bdbf1307e020533dbe816a0754b049fe1657.tar
forums-4d14bdbf1307e020533dbe816a0754b049fe1657.tar.gz
forums-4d14bdbf1307e020533dbe816a0754b049fe1657.tar.bz2
forums-4d14bdbf1307e020533dbe816a0754b049fe1657.tar.xz
forums-4d14bdbf1307e020533dbe816a0754b049fe1657.zip
Merge pull request #1698 from rechosen/ticket/11829
[ticket/11829] Use report_closed to determine status in MCP report_details
Diffstat (limited to 'phpBB/includes/mcp')
-rw-r--r--phpBB/includes/mcp/mcp_pm_reports.php1
-rw-r--r--phpBB/includes/mcp/mcp_reports.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php
index 77bc7680e6..0a33c80a90 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -166,6 +166,7 @@ class mcp_pm_reports
'S_CLOSE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports&amp;mode=pm_report_details&amp;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&amp;mode=pm_report_details&amp;r=' . $report_id),
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index def5422be2..b13c8b20c6 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -192,6 +192,7 @@ class mcp_reports
'S_POST_REPORTED' => $post_info['post_reported'],
'S_POST_UNAPPROVED' => !$post_info['post_approved'],
'S_POST_LOCKED' => $post_info['post_edit_locked'],
+ 'S_REPORT_CLOSED' => $report['report_closed'],
'S_USER_NOTES' => true,
'U_EDIT' => ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&amp;f={$post_info['forum_id']}&amp;p={$post_info['post_id']}") : '',