diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-31 15:00:04 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-31 15:00:04 -0400 |
| commit | 94ce8f2168bdd9897f54ec433ad7017fb3db1cc8 (patch) | |
| tree | db031ac7fd4788be6593e258d170c8f134533e4b /lib/filesystem.php | |
| parent | 269922543eaf9e69dbf5a15fa0ba34704040b09c (diff) | |
| parent | dfae77dec1650f171d09d4bde88ab74029f6e8c7 (diff) | |
| download | nextcloud-server-94ce8f2168bdd9897f54ec433ad7017fb3db1cc8.tar.gz nextcloud-server-94ce8f2168bdd9897f54ec433ad7017fb3db1cc8.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
Diffstat (limited to 'lib/filesystem.php')
| -rw-r--r-- | lib/filesystem.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/filesystem.php b/lib/filesystem.php index e5817a1bc82..72d3711e9a2 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -495,8 +495,12 @@ class OC_Filesystem{ } static public function removeETagHook($params) { - $path=$params['path']; - OC_Connector_Sabre_Node::removeETagPropertyForFile($path); + if (isset($params['path'])) { + $path=$params['path']; + } else { + $path=$params['oldpath']; + } + OC_Connector_Sabre_Node::removeETagPropertyForPath($path); } } OC_Hook::connect('OC_Filesystem','post_write', 'OC_Filesystem','removeETagHook'); |