diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-10-11 21:19:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 21:19:10 +0300 |
| commit | db034689117fb43ec9a3c613b99ad1bb88745e64 (patch) | |
| tree | 389086df3e1f7417207fa06bda0ab75ff1d5c579 | |
| parent | feb8a795ea92bdf544e987a17b800d3a3809c232 (diff) | |
| parent | 18c35e6060b4bc466a6b9b72977bdcfd06c5f268 (diff) | |
Merge pull request #11770 from nextcloud/backport/11764/stable14
[14] Normalize getUnjailedPath
| -rw-r--r-- | lib/private/Files/Storage/Wrapper/Jail.php | 3 |
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); } } |