Merge pull request #13223 from owncloud/optimize-normalize-unicode

Verify whether value is already normalized

lib/private/util.php

@@ -1274,14 +1274,17 @@ class OC_Util {
 	 * @return bool|string
 	 */
 	public static function normalizeUnicode($value) {
-		$normalizedValue = normalizer_normalize($value);
+		if(Normalizer::isNormalized($value)) {
+			return $value;
+		}
+
+		$normalizedValue = Normalizer::normalize($value);
 		if ($normalizedValue === null || $normalizedValue === false) {
-			\OC_Log::write('core', 'normalizing failed for "' . $value . '"', \OC_Log::WARN);
-		} else {
-			$value = $normalizedValue;
+			\OC::$server->getLogger()->warning('normalizing failed for "' . $value . '"', ['app' => 'core']);
+			return $value;
 		}
 
-		return $value;
+		return $normalizedValue;
 	}
 
 	/**