mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
[ticket/16698] Enhance check for default charset
PHPBB3-16698
This commit is contained in:
parent
bb8768b604
commit
ecf6acd730
1 changed files with 2 additions and 2 deletions
|
@ -690,7 +690,7 @@ class acp_main
|
||||||
$encoding_translation = $this->php_ini->getString('mbstring.encoding_translation');
|
$encoding_translation = $this->php_ini->getString('mbstring.encoding_translation');
|
||||||
$http_input = $this->php_ini->getString('mbstring.http_input');
|
$http_input = $this->php_ini->getString('mbstring.http_input');
|
||||||
$http_output = $this->php_ini->getString('mbstring.http_output');
|
$http_output = $this->php_ini->getString('mbstring.http_output');
|
||||||
$default_charset = $this->php_ini->getString('default_charset');
|
$default_charset = strtolower($this->php_ini->getString('default_charset'));
|
||||||
|
|
||||||
if (extension_loaded('mbstring'))
|
if (extension_loaded('mbstring'))
|
||||||
{
|
{
|
||||||
|
@ -704,7 +704,7 @@ class acp_main
|
||||||
'S_MBSTRING_ENCODING_TRANSLATION_FAIL' => $encoding_translation && ($encoding_translation != 0),
|
'S_MBSTRING_ENCODING_TRANSLATION_FAIL' => $encoding_translation && ($encoding_translation != 0),
|
||||||
'S_MBSTRING_HTTP_INPUT_FAIL' => !empty($http_input),
|
'S_MBSTRING_HTTP_INPUT_FAIL' => !empty($http_input),
|
||||||
'S_MBSTRING_HTTP_OUTPUT_FAIL' => !empty($http_output),
|
'S_MBSTRING_HTTP_OUTPUT_FAIL' => !empty($http_output),
|
||||||
'S_DEFAULT_CHARSET_FAIL' => $default_charset !== 'UTF-8',
|
'S_DEFAULT_CHARSET_FAIL' => $default_charset !== 'utf-8',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue