]> source.dussan.org Git - nextcloud-server.git/commitdiff
Do not obtain userFolder of a federated user 25274/head
authorRoeland Jago Douma <roeland@famdouma.nl>
Fri, 22 Jan 2021 12:52:43 +0000 (13:52 +0100)
committerRoeland Jago Douma <roeland@famdouma.nl>
Fri, 22 Jan 2021 12:52:43 +0000 (13:52 +0100)
Federated shares are somewhat special. So we can't move the files from
the main user and we should try to get it from the intialized root
already.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
apps/files_trashbin/lib/Storage.php

index 7ae96f1b6b73ce148978f0b7a96a07536310a939..936e6d646751c288022b6157d711c70396bd16ce 100644 (file)
@@ -135,7 +135,7 @@ class Storage extends Wrapper {
                // check if there is a app which want to disable the trash bin for this file
                $fileId = $this->storage->getCache()->getId($path);
                $owner = $this->storage->getOwner($path);
-               if ($owner === false) {
+               if ($owner === false || $this->storage->instanceOfStorage(\OCA\Files_Sharing\External\Storage::class)) {
                        $nodes = $this->rootFolder->getById($fileId);
                } else {
                        $nodes = $this->rootFolder->getUserFolder($owner)->getById($fileId);