From ecf6acd73010d261c4515807f30a7d7399c29ec8 Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Sat, 6 Feb 2021 04:42:49 +0100 Subject: [PATCH] [ticket/16698] Enhance check for default charset PHPBB3-16698 --- phpBB/includes/acp/acp_main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index f79da2e5fe..79b829e8c2 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -690,7 +690,7 @@ class acp_main $encoding_translation = $this->php_ini->getString('mbstring.encoding_translation'); $http_input = $this->php_ini->getString('mbstring.http_input'); $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')) { @@ -704,7 +704,7 @@ class acp_main 'S_MBSTRING_ENCODING_TRANSLATION_FAIL' => $encoding_translation && ($encoding_translation != 0), 'S_MBSTRING_HTTP_INPUT_FAIL' => !empty($http_input), 'S_MBSTRING_HTTP_OUTPUT_FAIL' => !empty($http_output), - 'S_DEFAULT_CHARSET_FAIL' => $default_charset !== 'UTF-8', + 'S_DEFAULT_CHARSET_FAIL' => $default_charset !== 'utf-8', ]); }