diff options
| author | n-aleha <nick_aleha@myway.com> | 2014-04-27 22:29:37 +0300 |
|---|---|---|
| committer | n-aleha <nick_aleha@myway.com> | 2014-04-27 22:29:37 +0300 |
| commit | edeeaa03c1875aa0e6c5b4d89a2f5fd5c2be2850 (patch) | |
| tree | 285519b8d7657492eadc3395326bcb17355fb584 /phpBB | |
| parent | 0b6accf1acd32b08c84906276717b3bdd43335a4 (diff) | |
| parent | 5a91399dac9eed844c79c10324034db531432589 (diff) | |
| download | forums-edeeaa03c1875aa0e6c5b4d89a2f5fd5c2be2850.tar forums-edeeaa03c1875aa0e6c5b4d89a2f5fd5c2be2850.tar.gz forums-edeeaa03c1875aa0e6c5b4d89a2f5fd5c2be2850.tar.bz2 forums-edeeaa03c1875aa0e6c5b4d89a2f5fd5c2be2850.tar.xz forums-edeeaa03c1875aa0e6c5b4d89a2f5fd5c2be2850.zip | |
Merge branch 'ticket/12186' into ticket/12186a
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/mcp/info/mcp_pm_reports.php | 2 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 39 |
2 files changed, 40 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/info/mcp_pm_reports.php b/phpBB/includes/mcp/info/mcp_pm_reports.php index 07dc564b19..d530a917cb 100644 --- a/phpBB/includes/mcp/info/mcp_pm_reports.php +++ b/phpBB/includes/mcp/info/mcp_pm_reports.php @@ -19,7 +19,7 @@ class mcp_pm_reports_info 'title' => 'MCP_PM_REPORTS', 'version' => '1.0.0', 'modes' => array( - 'pm_reports' => array('title' => 'MCP_PM_REPORTS_OPEN', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')), + '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')), ), diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index dcf2756850..858a133a3e 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1649,6 +1649,45 @@ class install_install extends module $_module->move_module_by($row, 'move_up', 5); } + if ($module_class == 'mcp') + { + // Move pm report details module 3 down... + $sql = 'SELECT * + FROM ' . MODULES_TABLE . " + WHERE module_basename = 'pm_reports' + AND module_class = 'mcp' + AND module_mode = 'pm_report_details'"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $_module->move_module_by($row, 'move_down', 3); + + // Move closed pm reports module 3 down... + $sql = 'SELECT * + FROM ' . MODULES_TABLE . " + WHERE module_basename = 'pm_reports' + AND module_class = 'mcp' + AND module_mode = 'pm_reports_closed'"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $_module->move_module_by($row, 'move_down', 3); + + // Move open pm reports module 3 down... + $sql = 'SELECT * + FROM ' . MODULES_TABLE . " + WHERE module_basename = 'pm_reports' + AND module_class = 'mcp' + AND module_mode = 'pm_reports'"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $_module->move_module_by($row, 'move_down', 3); + } + if ($module_class == 'ucp') { // Move attachment module 4 down... |