diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-10-20 23:20:43 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-10-20 23:20:43 +0200 |
| commit | a16f18541367e13949bf8c5f2117f4f5adcf5b33 (patch) | |
| tree | f28dccbc7c860449c45f03c89d19f3d7555cd0c6 /phpBB/includes/acp | |
| parent | 7c2ed57a9916337da261794a1baa044a5814b8a1 (diff) | |
| parent | afada9ed409ca7abdb2dc95c10d1cac3aacf86a6 (diff) | |
| download | forums-a16f18541367e13949bf8c5f2117f4f5adcf5b33.tar forums-a16f18541367e13949bf8c5f2117f4f5adcf5b33.tar.gz forums-a16f18541367e13949bf8c5f2117f4f5adcf5b33.tar.bz2 forums-a16f18541367e13949bf8c5f2117f4f5adcf5b33.tar.xz forums-a16f18541367e13949bf8c5f2117f4f5adcf5b33.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
Diffstat (limited to 'phpBB/includes/acp')
| -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', '')), )); } |