diff options
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | lib/base.php | 3 | ||||
| -rw-r--r-- | lib/private/legacy/OC_Util.php | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/3rdparty b/3rdparty -Subproject 875ee27505a280f58a893b16976fe36572fd82c +Subproject 86573beb84cf3b62b6d01ee377225df83b7d245 diff --git a/lib/base.php b/lib/base.php index bbc777d5ea8..d232ff85497 100644 --- a/lib/base.php +++ b/lib/base.php @@ -629,8 +629,7 @@ class OC { self::handleAuthHeaders(); self::registerAutoloaderCache(); - // initialize intl fallback is necessary - \Patchwork\Utf8\Bootup::initIntl(); + // initialize intl fallback if necessary OC_Util::isSetLocaleWorking(); if (!defined('PHPUNIT_RUN')) { diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 826d0a31129..4176dfbb229 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -1293,7 +1293,13 @@ class OC_Util { * @return bool */ public static function isSetLocaleWorking() { - \Patchwork\Utf8\Bootup::initLocale(); + if ('' === basename('§')) { + // 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 ('' === basename('§')) { return false; } |