mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 23:55:26 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop-ascraeus

Browse Source 
* develop-olympus:
  [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
This commit is contained in:
Nils Adermann 2014-05-02 15:39:52 +02:00
commit d52c2d1b5c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/install/install_install.php
View File

@ -290,8 +290,8 @@ class install_install extends module
$checks = array( $checks = array(
array('func_overload', '&', MB_OVERLOAD_MAIL|MB_OVERLOAD_STRING), array('func_overload', '&', MB_OVERLOAD_MAIL|MB_OVERLOAD_STRING),
array('encoding_translation', '!=', 0), array('encoding_translation', '!=', 0),
array('http_input', '!=', 'pass'), array('http_input', '!=', array('pass', '')),
array('http_output', '!=', 'pass') array('http_output', '!=', array('pass', ''))
); );
foreach ($checks as $mb_checks) foreach ($checks as $mb_checks)
@ -312,7 +312,8 @@ class install_install extends module
break; break;
case '!=': 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>'; $result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
$passed['mbstring'] = false; $passed['mbstring'] = false;