diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-02 14:40:40 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-02 14:41:08 +0200 |
| commit | 370015c1a5f490a7fae85da268b81cb8d1748f50 (patch) | |
| tree | bb5389ce6d5bd25c6f714ae60739e69c00afe131 | |
| parent | 43c6fd768fa94b7befabeb71ae8e728ff84e731d (diff) | |
| download | forums-370015c1a5f490a7fae85da268b81cb8d1748f50.tar forums-370015c1a5f490a7fae85da268b81cb8d1748f50.tar.gz forums-370015c1a5f490a7fae85da268b81cb8d1748f50.tar.bz2 forums-370015c1a5f490a7fae85da268b81cb8d1748f50.tar.xz forums-370015c1a5f490a7fae85da268b81cb8d1748f50.zip | |
[ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
PHPBB3-12468
| -rw-r--r-- | phpBB/install/install_install.php | 7 |
1 files changed, 4 insertions, 3 deletions
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; |