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

Replace patchwork/utf8 with symfony-polyfill-*
nextcloud · Jan 8, 2021 · d13f2d9 · d13f2d9
2 parents 741e5e2 + 287c26b
commit d13f2d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/3rdparty b/3rdparty
diff --git a/lib/base.php b/lib/base.php
@@ -624,8 +624,7 @@ public static function init() {
 		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
@@ -1293,7 +1293,13 @@ public function isHtaccessWorking(\OCP\IConfig $config) {
 	 * @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;
 		}