Skip to content
Snippets Groups Projects
Unverified Commit 287c26bd authored by Christoph Wurst's avatar Christoph Wurst Committed by Morris Jobke
Browse files

Replace patchwork/utf8 with symfony-polyfill-*

parent 82947263
No related branches found
No related tags found
No related merge requests found
Subproject commit 875ee27505a280f58a893b16976fe36572fd82c4 Subproject commit 86573beb84cf3b62b6d01ee377225df83b7d2453
...@@ -629,8 +629,7 @@ class OC { ...@@ -629,8 +629,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')) {
......
...@@ -1293,7 +1293,13 @@ class OC_Util { ...@@ -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;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment