Merge pull request #3459 from owncloud/fix_for_2377

fix problems with german "Umlaut" in folder name

1 files changed, 19 insertions, 0 deletions

diff --git a/lib/util.php b/lib/util.php
index 581f35bc0ac..b5fbb49e308 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once 'Patchwork/PHP/Shim/Normalizer.php';
+
 /**
  * Class for utility functions
  *
@@ -823,5 +826,21 @@ class OC_Util {
 		return $theme;
 	}
 
+	/**
+	 * Normalize a unicode string
+	 * @param string $value a not normalized string
+	 * @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;
+			}
+		}
 
+		return $value;
+	}
 }