diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 15:39:52 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 15:39:52 +0200 |
| commit | d52c2d1b5caf1382d178e55eff311ceddf4b392f (patch) | |
| tree | 595ae57755a7d3322e0e986578ddbfa2146dcb27 /phpBB | |
| parent | fa1ac3c54d471f93b0fb10ef58aba13008dfa119 (diff) | |
| parent | c7450592d8a1b4de666d1a4025551a6711239689 (diff) | |
| download | forums-d52c2d1b5caf1382d178e55eff311ceddf4b392f.tar forums-d52c2d1b5caf1382d178e55eff311ceddf4b392f.tar.gz forums-d52c2d1b5caf1382d178e55eff311ceddf4b392f.tar.bz2 forums-d52c2d1b5caf1382d178e55eff311ceddf4b392f.tar.xz forums-d52c2d1b5caf1382d178e55eff311ceddf4b392f.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
Diffstat (limited to 'phpBB')
| -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 191be59258..f9d5edc903 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -290,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) @@ -312,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; |