From d2eb5aaa6ddbdd3fbbf6ba871f04398038eddcb2 Mon Sep 17 00:00:00 2001 From: Naoto Kobayashi Date: Sun, 14 Nov 2021 08:25:32 +0900 Subject: [PATCH] Check whether setlocale works only after setlocale Signed-off-by: Naoto Kobayashi --- lib/private/legacy/OC_Util.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 94fcb900898cf..75c337f8baa96 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -1249,12 +1249,13 @@ public static function isSetLocaleWorking() { // Borrowed from \Patchwork\Utf8\Bootup::initLocale setlocale(LC_ALL, 'C.UTF-8', 'C'); setlocale(LC_CTYPE, 'en_US.UTF-8', 'fr_FR.UTF-8', 'es_ES.UTF-8', 'de_DE.UTF-8', 'ru_RU.UTF-8', 'pt_BR.UTF-8', 'it_IT.UTF-8', 'ja_JP.UTF-8', 'zh_CN.UTF-8', '0'); - } - // Check again - if ('' === escapeshellcmd('§')) { - return false; + // Check again + if ('' === escapeshellcmd('§')) { + return false; + } } + return true; }