diff options
author | Florin Peter <github@florin-peter.de> | 2013-05-24 20:36:20 +0200 |
---|---|---|
committer | Florin Peter <github@florin-peter.de> | 2013-05-24 20:36:20 +0200 |
commit | 736f10039dd1b494966f1214916dc62119478176 (patch) | |
tree | 56692bc7ae84fbd447886ea440f6790220e6394d /lib/files | |
parent | 661b5501b0e3f456d3a56d72e342074062ded0e8 (diff) | |
download | nextcloud-server-736f10039dd1b494966f1214916dc62119478176.tar.gz nextcloud-server-736f10039dd1b494966f1214916dc62119478176.zip |
changed builtin normalizer to \OC_Util::normalizeUnicode
Diffstat (limited to 'lib/files')
-rw-r--r-- | lib/files/cache/cache.php | 7 | ||||
-rw-r--r-- | lib/files/filesystem.php | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php index a7e634c8e41..865abd5286f 100644 --- a/lib/files/cache/cache.php +++ b/lib/files/cache/cache.php @@ -566,11 +566,6 @@ class Cache { */ public function normalize($path) { - //normalize unicode if possible - if (class_exists('Normalizer')) { - $path = \Normalizer::normalize($path); - } - - return $path; + return \OC_Util::normalizeUnicode($path); } } diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index d60d430d77c..5d7565f0d83 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -616,9 +616,8 @@ class Filesystem { $path = substr($path, 0, -1); } //normalize unicode if possible - if (class_exists('Normalizer')) { - $path = \Normalizer::normalize($path); - } + $path = \OC_Util::normalizeUnicode($path); + return $path; } |