summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-10-10 16:06:26 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-10-10 16:06:26 +0200
commitbc6e352ccd41f0641144fc1fc2d4e52e8f5532c0 (patch)
tree8cf140e04be65bb5f8dee5b81e608f578628b3ba /lib
parent666e52a46b971d49eb43024afe87cabf42b6f49b (diff)
downloadnextcloud-server-bc6e352ccd41f0641144fc1fc2d4e52e8f5532c0.tar.gz
nextcloud-server-bc6e352ccd41f0641144fc1fc2d4e52e8f5532c0.zip
the path need to be normalized before putting it into resolvePath()
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/view.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index f74b595c8da..086e7487a6a 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);
}
/**