makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'github-bantu/ticket/12468' into develop-olympus

Browse source 
* 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
This commit is contained in:
Nils Adermann 2014-05-02 15:36:59 +02:00
commit c7450592d8
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -4,9 +4,7 @@
/phpBB/cache/*.php /phpBB/cache/*.php
/phpBB/cache/*.lock /phpBB/cache/*.lock
/phpBB/composer.phar /phpBB/composer.phar
/phpBB/config.php /phpBB/config*.php
/phpBB/config_dev.php
/phpBB/config_test.php
/phpBB/ext/* /phpBB/ext/*
/phpBB/files/* /phpBB/files/*
/phpBB/images/avatars/gallery/* /phpBB/images/avatars/gallery/*
@ -14,5 +12,5 @@
/phpBB/store/* /phpBB/store/*
/phpBB/vendor /phpBB/vendor
/tests/phpbb_unit_tests.sqlite2 /tests/phpbb_unit_tests.sqlite2
/tests/test_config.php /tests/test_config*.php
/tests/tmp/* /tests/tmp/*

7
phpBB/install/install_install.php
View file

@ -273,8 +273,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)
@ -295,7 +295,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;