diff options
| author | VicDeo <dubiniuk@owncloud.com> | 2013-10-10 09:27:45 -0700 |
|---|---|---|
| committer | VicDeo <dubiniuk@owncloud.com> | 2013-10-10 09:27:45 -0700 |
| commit | 26c0007a5ff65a718abce63939b65de0cda9c7a1 (patch) | |
| tree | 748b886efd52f08cfe7557b9fee3c66d8f5115ed /lib/private | |
| parent | 0641365a1033b3e6b926a5e280f3bd2559e2ea23 (diff) | |
| parent | bc6e352ccd41f0641144fc1fc2d4e52e8f5532c0 (diff) | |
| download | nextcloud-server-26c0007a5ff65a718abce63939b65de0cda9c7a1.tar.gz nextcloud-server-26c0007a5ff65a718abce63939b65de0cda9c7a1.zip | |
Merge pull request #5263 from owncloud/fixing-5255-master
Proper behavior of resolvePath()
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/files/view.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 8143b12d526..a56135d9b3c 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -110,7 +110,9 @@ class View { * @return array consisting of the storage and the internal path */ public function resolvePath($path) { - return Filesystem::resolvePath($this->getAbsolutePath($path)); + $a = $this->getAbsolutePath($path); + $p = Filesystem::normalizePath($a); + return Filesystem::resolvePath($p); } /** |