]> 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>
Thu, 23 Jul 2020 13:24:44 +0000 (15:24 +0200)
commit59498493220a666573516679e7752d09543ac1b5
tree77d87a5499dc077bd5f36b9fbcf19a58b45c0cae
parentba39d7adde56114bffe407e23edbbbb5730252fd
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