mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25015 from nextcloud/fix/no-double-intl-polyfill 

Replace patchwork/utf8 with symfony-polyfill-*
This commit is contained in:
Roeland Jago Douma 2021-01-08 08:25:31 +01:00 committed by GitHub
parent 741e5e273b 287c26bda3
commit d13f2d984f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit 875ee27505a280f58a893b16976fe36572fd82c4 Subproject commit 86573beb84cf3b62b6d01ee377225df83b7d2453

3
lib/base.php
View File

@ -624,8 +624,7 @@ class OC {
self::handleAuthHeaders(); self::handleAuthHeaders();
self::registerAutoloaderCache(); self::registerAutoloaderCache();
// initialize intl fallback is necessary // initialize intl fallback if necessary
\Patchwork\Utf8\Bootup::initIntl();
OC_Util::isSetLocaleWorking(); OC_Util::isSetLocaleWorking();
if (!defined('PHPUNIT_RUN')) { if (!defined('PHPUNIT_RUN')) {

8
lib/private/legacy/OC_Util.php
View File

@ -1293,7 +1293,13 @@ class OC_Util {
* @return bool * @return bool
*/ */
public static function isSetLocaleWorking() { 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('§')) { if ('' === basename('§')) {
return false; return false;
} }