diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-13 04:29:20 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-13 04:29:20 +0200 |
| commit | 11e9ce25e622ea3a98c8085717541620fb878a69 (patch) | |
| tree | 4cc0563d51768efa01a92a7333f370a4d0ccf3d3 /lib/files/filesystem.php | |
| parent | 141ff806c6cfbd349ffa232502a89a620882c409 (diff) | |
| parent | d386bc8737374200b4dc8ca0b62e432757ac2f04 (diff) | |
| download | nextcloud-server-11e9ce25e622ea3a98c8085717541620fb878a69.tar.gz nextcloud-server-11e9ce25e622ea3a98c8085717541620fb878a69.zip | |
merge master into filesystem
Diffstat (limited to 'lib/files/filesystem.php')
| -rw-r--r-- | lib/files/filesystem.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index 841f30c7679..e4c269257c2 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -550,15 +550,15 @@ class Filesystem { static public function removeETagHook($params, $root = false) { if (isset($params['path'])) { - $path = $params['path']; + $path=$params['path']; } else { - $path = $params['oldpath']; + $path=$params['oldpath']; } if ($root) { // reduce path to the required part of it (no 'username/files') - $fakeRootView = new View($root); + $fakeRootView = new OC_FilesystemView($root); $count = 1; - $path = str_replace(\OC_App::getStorage("files")->getAbsolutePath($path), "", $fakeRootView->getAbsolutePath($path), $count); + $path=str_replace(OC_App::getStorage("files")->getAbsolutePath(), "", $fakeRootView->getAbsolutePath($path), $count); } $path = self::normalizePath($path); |