diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-10-20 23:20:42 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-10-20 23:20:42 +0200 |
| commit | afada9ed409ca7abdb2dc95c10d1cac3aacf86a6 (patch) | |
| tree | e62e30c945bd50af5c3f1bac064d1525fb4f2be0 /phpBB/includes | |
| parent | 75b6545bc271f4e488cf8dc7708a871e4c7dc446 (diff) | |
| parent | b71cf56bda9413afaad2933bd5d09eb80c3a19bc (diff) | |
| download | forums-afada9ed409ca7abdb2dc95c10d1cac3aacf86a6.tar forums-afada9ed409ca7abdb2dc95c10d1cac3aacf86a6.tar.gz forums-afada9ed409ca7abdb2dc95c10d1cac3aacf86a6.tar.bz2 forums-afada9ed409ca7abdb2dc95c10d1cac3aacf86a6.tar.xz forums-afada9ed409ca7abdb2dc95c10d1cac3aacf86a6.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 2a28226d6c..48ca05a118 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -655,8 +655,8 @@ class acp_main 'S_MBSTRING_LOADED' => true, 'S_MBSTRING_FUNC_OVERLOAD_FAIL' => (intval(@ini_get('mbstring.func_overload')) & (MB_OVERLOAD_MAIL | MB_OVERLOAD_STRING)), 'S_MBSTRING_ENCODING_TRANSLATION_FAIL' => (@ini_get('mbstring.encoding_translation') != 0), - 'S_MBSTRING_HTTP_INPUT_FAIL' => (@ini_get('mbstring.http_input') != 'pass'), - 'S_MBSTRING_HTTP_OUTPUT_FAIL' => (@ini_get('mbstring.http_output') != 'pass'), + 'S_MBSTRING_HTTP_INPUT_FAIL' => !in_array(@ini_get('mbstring.http_input'), array('pass', '')), + 'S_MBSTRING_HTTP_OUTPUT_FAIL' => !in_array(@ini_get('mbstring.http_output'), array('pass', '')), )); } |