diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 15:36:59 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 15:36:59 +0200 |
| commit | c7450592d8a1b4de666d1a4025551a6711239689 (patch) | |
| tree | bb5389ce6d5bd25c6f714ae60739e69c00afe131 | |
| parent | fa230b48ec3b9d79687a2e40804afd75ec4915d6 (diff) | |
| parent | 370015c1a5f490a7fae85da268b81cb8d1748f50 (diff) | |
| download | forums-c7450592d8a1b4de666d1a4025551a6711239689.tar forums-c7450592d8a1b4de666d1a4025551a6711239689.tar.gz forums-c7450592d8a1b4de666d1a4025551a6711239689.tar.bz2 forums-c7450592d8a1b4de666d1a4025551a6711239689.tar.xz forums-c7450592d8a1b4de666d1a4025551a6711239689.zip | |
Merge remote-tracking branch 'github-bantu/ticket/12468' into develop-olympus
* github-bantu/ticket/12468:
[ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
[ticket/12467] Add config*.php and tests_config*.php to .gitignore
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index c757210654..06f50e9c4e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,7 @@ /phpBB/cache/*.php /phpBB/cache/*.lock /phpBB/composer.phar -/phpBB/config.php -/phpBB/config_dev.php -/phpBB/config_test.php +/phpBB/config*.php /phpBB/ext/* /phpBB/files/* /phpBB/images/avatars/gallery/* @@ -14,5 +12,5 @@ /phpBB/store/* /phpBB/vendor /tests/phpbb_unit_tests.sqlite2 -/tests/test_config.php +/tests/test_config*.php /tests/tmp/* diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 78f3f00eda..cb63c70e11 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -273,8 +273,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) @@ -295,7 +295,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; |