diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-11 10:48:53 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-11 10:48:53 +0200 |
| commit | 8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d (patch) | |
| tree | 509de1d16752d04171d7fe275a2788976c509c46 /phpBB/includes | |
| parent | f6f796770a0964589669d97a1c4d79569b900de8 (diff) | |
| parent | f6c8338358e5216a62c37bc8ccf252d0e5c6fe0f (diff) | |
| download | forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar.gz forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar.bz2 forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar.xz forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/mcp/info/mcp_pm_reports.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_front.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/info/mcp_pm_reports.php b/phpBB/includes/mcp/info/mcp_pm_reports.php index 6f8b8d9937..2a57c0c49a 100644 --- a/phpBB/includes/mcp/info/mcp_pm_reports.php +++ b/phpBB/includes/mcp/info/mcp_pm_reports.php @@ -19,9 +19,9 @@ class mcp_pm_reports_info 'filename' => 'mcp_pm_reports', 'title' => 'MCP_PM_REPORTS', 'modes' => array( - 'pm_reports' => array('title' => 'MCP_PM_REPORTS_OPEN', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')), - 'pm_reports_closed' => array('title' => 'MCP_PM_REPORTS_CLOSED', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')), - 'pm_report_details' => array('title' => 'MCP_PM_REPORT_DETAILS', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')), + 'pm_reports' => array('title' => 'MCP_PM_REPORTS_OPEN', 'auth' => 'acl_m_pm_report', 'cat' => array('MCP_REPORTS')), + 'pm_reports_closed' => array('title' => 'MCP_PM_REPORTS_CLOSED', 'auth' => 'acl_m_pm_report', 'cat' => array('MCP_REPORTS')), + 'pm_report_details' => array('title' => 'MCP_PM_REPORT_DETAILS', 'auth' => 'acl_m_pm_report', 'cat' => array('MCP_REPORTS')), ), ); } diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php index 0d03a37731..23a0604ccd 100644 --- a/phpBB/includes/mcp/mcp_front.php +++ b/phpBB/includes/mcp/mcp_front.php @@ -274,7 +274,7 @@ function mcp_front_view($id, $mode, $action) } // Latest 5 reported PMs - if ($module->loaded('pm_reports') && $auth->acl_getf_global('m_report')) + if ($module->loaded('pm_reports') && $auth->acl_get('m_pm_report')) { $template->assign_var('S_SHOW_PM_REPORTS', true); $user->add_lang(array('ucp')); |