diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-05-08 18:43:46 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-05-08 18:43:46 +0200 |
| commit | 8121f87f084c0e1790dd59105a00de8d4b3c7cdb (patch) | |
| tree | a9e2d9565cec2c9888390337852c64ab88284e4b /phpBB/install/install_install.php | |
| parent | bfd66ef2fdc1721ded267b6a0af3883f827840c1 (diff) | |
| parent | d4fc060bcd61228fdf78da4f2d290a7a17546c46 (diff) | |
| download | forums-8121f87f084c0e1790dd59105a00de8d4b3c7cdb.tar forums-8121f87f084c0e1790dd59105a00de8d4b3c7cdb.tar.gz forums-8121f87f084c0e1790dd59105a00de8d4b3c7cdb.tar.bz2 forums-8121f87f084c0e1790dd59105a00de8d4b3c7cdb.tar.xz forums-8121f87f084c0e1790dd59105a00de8d4b3c7cdb.zip | |
Merge branch 'develop-ascraeus' of github.com:phpbb/phpbb into ticket/12407
* 'develop-ascraeus' of github.com:phpbb/phpbb: (424 commits)
[ticket/12428] Use the database to store the original version number
[ticket/12493] Add functional test
[ticket/12493] Fix sql query for selection of users that have disabled PM
[ticket/12513] Add asset include support to simple header/footer in ACP
[ticket/12513] Add simple_header head event with support for CSS assets calls
[ticket/12511] Add missing titles for profile fields in members group view
[ticket/12428] Incorrect from version in database update log entry
[ticket/12510] Convert & to & in build_url() when no params are stripped.
[ticket/12402] CAPTCHA plugin migration fails to detect missing plugins
[ticket/12440] Use a more generic approach for replacing the URL.
[ticket/12507] Move the 'require' statement
[ticket/12507] Add console command to purge the cache
[ticket/12421] Rebase and enable tests
[ticket/12421] Don't parse [attachment] tags if user can't view them
[ticket/12325] Use \RecursiveDirectoryIterator
[ticket/12325] Doc blocks
[ticket/12440] Set browser URL to point to specific post when using view=unread
[ticket/12357] Support routes in generate_smilies() function.
[ticket/12459] Change language strings
[ticket/12504] Use local variables where possible
...
Conflicts:
phpBB/posting.php
Diffstat (limited to 'phpBB/install/install_install.php')
| -rw-r--r-- | phpBB/install/install_install.php | 60 |
1 files changed, 55 insertions, 5 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index db8156a831..f9d5edc903 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -217,7 +217,6 @@ class install_install extends module 'S_LEGEND' => false, )); - // Check for getimagesize if (@function_exists('getimagesize')) { @@ -291,8 +290,8 @@ class install_install extends module $checks = array( array('func_overload', '&', MB_OVERLOAD_MAIL|MB_OVERLOAD_STRING), array('encoding_translation', '!=', 0), - array('http_input', '!=', 'pass'), - array('http_output', '!=', 'pass') + array('http_input', '!=', array('pass', '')), + array('http_output', '!=', array('pass', '')) ); foreach ($checks as $mb_checks) @@ -313,7 +312,8 @@ class install_install extends module break; case '!=': - if ($ini_val != $mb_checks[2]) + if (!is_array($mb_checks[2]) && $ini_val != $mb_checks[2] || + is_array($mb_checks[2]) && !in_array($ini_val, $mb_checks[2])) { $result = '<strong style="color:red">' . $lang['NO'] . '</strong>'; $passed['mbstring'] = false; @@ -535,7 +535,6 @@ class install_install extends module $url = (!in_array(false, $passed)) ? $this->p_master->module_url . "?mode=$mode&sub=database&language=$language" : $this->p_master->module_url . "?mode=$mode&sub=requirements&language=$language "; $submit = (!in_array(false, $passed)) ? $lang['INSTALL_START'] : $lang['INSTALL_TEST']; - $template->assign_vars(array( 'L_SUBMIT' => $submit, 'S_HIDDEN' => $s_hidden_fields, @@ -1649,6 +1648,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 = 'mcp_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 = 'mcp_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 = 'mcp_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... @@ -1674,6 +1712,18 @@ class install_install extends module $db->sql_freeresult($result); $_module->move_module_by($row, 'move_down', 4); + + // Move OAuth module 5 down... + $sql = 'SELECT * + FROM ' . MODULES_TABLE . " + WHERE module_basename = 'ucp_auth_link' + AND module_class = 'ucp' + AND module_mode = 'auth_link'"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $_module->move_module_by($row, 'move_down', 5); } // And now for the special ones |