aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-10-11 20:18:44 +0200
committerGitHub <noreply@github.com>2018-10-11 20:18:44 +0200
commit1fcb5db266963cef18f1fede43945a48572fe7a2 (patch)
treed5c20154d585ac148c89c7c679c8713655ef9c63
parentdd8350b3b3bb5f7cc923520066f907739e4e0734 (diff)
parent51e96dc3f6de6f38cc899ed771b8225858fa62c8 (diff)
downloadnextcloud-server-1fcb5db266963cef18f1fede43945a48572fe7a2.tar.gz
nextcloud-server-1fcb5db266963cef18f1fede43945a48572fe7a2.zip
Merge pull request #11764 from nextcloud/fix/11637/sharedstorageroot
Do not pass '.' along as path
-rw-r--r--lib/private/Files/Storage/Wrapper/Jail.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Files/Storage/Wrapper/Jail.php b/lib/private/Files/Storage/Wrapper/Jail.php
index adee8ced772..56514af6d80 100644
--- a/lib/private/Files/Storage/Wrapper/Jail.php
+++ b/lib/private/Files/Storage/Wrapper/Jail.php
@@ -27,6 +27,7 @@ namespace OC\Files\Storage\Wrapper;
use OC\Files\Cache\Wrapper\CacheJail;
use OC\Files\Cache\Wrapper\JailPropagator;
+use OC\Files\Filesystem;
use OCP\Files\Storage\IStorage;
use OCP\Lock\ILockingProvider;
@@ -56,7 +57,7 @@ class Jail extends Wrapper {
if ($path === '') {
return $this->rootPath;
} else {
- return $this->rootPath . '/' . $path;
+ return Filesystem::normalizePath($this->rootPath . '/' . $path);
}
}