summaryrefslogtreecommitdiffstats
path: root/lib/private/files
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/files')
-rw-r--r--lib/private/files/cache/cache.php2
-rw-r--r--lib/private/files/cache/wrapper/cachejail.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 9df64db7f07..bf44cf48aa7 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -699,6 +699,6 @@ class Cache {
*/
public function normalize($path) {
- return \OC_Util::normalizeUnicode($path);
+ return trim(\OC_Util::normalizeUnicode($path), '/');
}
}
diff --git a/lib/private/files/cache/wrapper/cachejail.php b/lib/private/files/cache/wrapper/cachejail.php
index f4ffc67d76a..3f7ea66ea1b 100644
--- a/lib/private/files/cache/wrapper/cachejail.php
+++ b/lib/private/files/cache/wrapper/cachejail.php
@@ -30,7 +30,7 @@ class CacheJail extends CacheWrapper {
if ($path === '') {
return $this->root;
} else {
- return $this->root . '/' . $path;
+ return $this->root . '/' . ltrim($path, '/');
}
}