From 59209e0f2b3376c7a03df393fc731ca99ced1213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 9 Sep 2014 14:41:45 +0200
Subject: [PATCH] use intl's native normalizer_normalize() in case the module
 is available

---
 lib/base.php         |  3 +++
 lib/private/util.php | 12 +++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 5d52db68cb..e4d4d09f00 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -495,6 +495,9 @@ class OC {
 			require_once $vendorAutoLoad;
 		}
 
+		// initialize intl fallback is necessary
+		\Patchwork\Utf8\Bootup::initIntl();
+
 		if (!defined('PHPUNIT_RUN')) {
 			OC\Log\ErrorHandler::setLogger(OC_Log::$object);
 			if (defined('DEBUG') and DEBUG) {
diff --git a/lib/private/util.php b/lib/private/util.php
index a130d997ca..79f3eb7b48 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1402,13 +1402,11 @@ class OC_Util {
 	 * @return bool|string
 	 */
 	public static function normalizeUnicode($value) {
-		if (class_exists('Patchwork\PHP\Shim\Normalizer')) {
-			$normalizedValue = \Patchwork\PHP\Shim\Normalizer::normalize($value);
-			if ($normalizedValue === false) {
-				\OC_Log::write('core', 'normalizing failed for "' . $value . '"', \OC_Log::WARN);
-			} else {
-				$value = $normalizedValue;
-			}
+		$normalizedValue = normalizer_normalize($value);
+		if ($normalizedValue === null || $normalizedValue === false) {
+			\OC_Log::write('core', 'normalizing failed for "' . $value . '"', \OC_Log::WARN);
+		} else {
+			$value = $normalizedValue;
 		}
 
 		return $value;