diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-09-22 14:28:14 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-09-22 14:28:14 +0200 |
| commit | 93292516d9a44bb16a19093f38d3fbd562d27133 (patch) | |
| tree | 3b3c5059eb27ccfd08d5fb47a68dac497f84ecc0 /lib/filesystem.php | |
| parent | 954596c251cb3132878d8d5eafcc37c47b3f520e (diff) | |
| parent | b4de89e6b4c05ddb99010e0dee071c919d338d5e (diff) | |
| download | nextcloud-server-93292516d9a44bb16a19093f38d3fbd562d27133.tar.gz nextcloud-server-93292516d9a44bb16a19093f38d3fbd562d27133.zip | |
Merge branch 'master' into filesystem
Diffstat (limited to 'lib/filesystem.php')
| -rw-r--r-- | lib/filesystem.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/filesystem.php b/lib/filesystem.php index ef8b3fef5bb..e936dfcce26 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -375,7 +375,7 @@ class OC_Filesystem{ * @return string */ static public function getLocalPath($path) { - $datadir = OC_User::getHome($user).'/files'; + $datadir = OC_User::getHome(OC_User::getUser()).'/files'; $newpath = $path; if (strncmp($newpath, $datadir, strlen($datadir)) == 0) { $newpath = substr($path, strlen($datadir)); @@ -545,6 +545,7 @@ class OC_Filesystem{ } else { $path=$params['oldpath']; } + $path = self::normalizePath($path); OC_Connector_Sabre_Node::removeETagPropertyForPath($path); } |