diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-01 14:21:49 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-01 14:21:49 +0200 |
| commit | b7eb3f3dff93762483f6b5a6d647d4855595f318 (patch) | |
| tree | 389035167dc9f1928aadd6f8f637adb9ca867ff6 /lib/filesystemview.php | |
| parent | 88bca9bc49343906b5b498f4d3837002d346b3af (diff) | |
| parent | 804372947ae5cdaeaa8c92250f4efb4ae54e8a3f (diff) | |
| download | nextcloud-server-b7eb3f3dff93762483f6b5a6d647d4855595f318.tar.gz nextcloud-server-b7eb3f3dff93762483f6b5a6d647d4855595f318.zip | |
merge master into filesystem
Diffstat (limited to 'lib/filesystemview.php')
| -rw-r--r-- | lib/filesystemview.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/filesystemview.php b/lib/filesystemview.php index 210f9dad55a..071fc781f12 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -451,8 +451,9 @@ class OC_FilesystemView { OC_Filesystem::signal_post_write, array( OC_Filesystem::signal_param_path => $path2) ); - } else { // no real copy, file comes from somewhere else, e.g. version rollback -> just update the file cache without all the other post_write actions + } else { // no real copy, file comes from somewhere else, e.g. version rollback -> just update the file cache and the webdav properties without all the other post_write actions OC_FileCache_Update::update($path2, $this->fakeRoot); + OC_Filesystem::removeETagHook(array("path" => $path2), $this->fakeRoot); } return $result; } |