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 | b71cf56bda9413afaad2933bd5d09eb80c3a19bc (patch) | |
| tree | 3b928bfa333da8e75e00f1e5524a132132fe7fbc /phpBB | |
| parent | d4faeb064bf7a3e97e1258d40343e83c80308024 (diff) | |
| parent | 53f166274aaa55b98a1c671dbb5cbd403d879157 (diff) | |
| download | forums-b71cf56bda9413afaad2933bd5d09eb80c3a19bc.tar forums-b71cf56bda9413afaad2933bd5d09eb80c3a19bc.tar.gz forums-b71cf56bda9413afaad2933bd5d09eb80c3a19bc.tar.bz2 forums-b71cf56bda9413afaad2933bd5d09eb80c3a19bc.tar.xz forums-b71cf56bda9413afaad2933bd5d09eb80c3a19bc.zip | |
Merge pull request #3047 from Elsensee/ticket/13168
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
* Elsensee/ticket/13168:
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
Diffstat (limited to 'phpBB')
| -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 d80b0d1532..79557bb5fd 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -606,8 +606,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', '')), )); } |