]> source.dussan.org Git - nextcloud-server.git/commit
fix moving files from external storage to object store trashbin
authorRobin Appelman <robin@icewind.nl>
Mon, 29 Jun 2020 16:14:47 +0000 (18:14 +0200)
committerRobin Appelman <robin@icewind.nl>
Fri, 31 Jul 2020 15:32:05 +0000 (17:32 +0200)
commit7e12f9c9bb757fa71abd216b21223cc738b8acc2
tree6f045f140851aeb2623d8bffbfd8db12343ef122
parentd56beaf07a6ee85638024c135d793da8020684da
fix moving files from external storage to object store trashbin

having the "cache rename" after the "storage move" caused the target
to get the fileid from the source file, without taking care that the object
is stored under the original file id.

By doing the "cache rename" first, we trigger the "update existing file"
logic while moving the file to the object store and the object gets stored for the
correct file id

Signed-off-by: Robin Appelman <robin@icewind.nl>
apps/files_trashbin/lib/Trashbin.php
lib/private/Files/Storage/Common.php