aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2014-10-20 16:45:02 +0200
committerOliver Schramm <oliver.schramm97@gmail.com>2014-10-20 16:47:52 +0200
commit53f166274aaa55b98a1c671dbb5cbd403d879157 (patch)
tree8167ad9e3fc99204b9d2eb1226fff11f12663416 /phpBB/includes
parenta12a7d0b9058cd3b7ca43bcea3c5a569df7b700b (diff)
downloadforums-53f166274aaa55b98a1c671dbb5cbd403d879157.tar
forums-53f166274aaa55b98a1c671dbb5cbd403d879157.tar.gz
forums-53f166274aaa55b98a1c671dbb5cbd403d879157.tar.bz2
forums-53f166274aaa55b98a1c671dbb5cbd403d879157.tar.xz
forums-53f166274aaa55b98a1c671dbb5cbd403d879157.zip
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
PHPBB3-13168
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_main.php4
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', '')),
));
}