diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2021-01-22 13:52:43 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2021-01-22 13:52:43 +0100 |
| commit | a0988281eed23da87ad2d39d8bce5a3935bd3dc9 (patch) | |
| tree | c445e50938d45c6c5c97159f56762d155f8100d7 /apps | |
| parent | 9f81239033b1c386a1aa026632b63cbeb8f14df8 (diff) | |
| download | nextcloud-server-a0988281eed23da87ad2d39d8bce5a3935bd3dc9.tar.gz nextcloud-server-a0988281eed23da87ad2d39d8bce5a3935bd3dc9.zip | |
Do not obtain userFolder of a federated user
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>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_trashbin/lib/Storage.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/Storage.php b/apps/files_trashbin/lib/Storage.php index 7ae96f1b6b7..936e6d64675 100644 --- a/apps/files_trashbin/lib/Storage.php +++ b/apps/files_trashbin/lib/Storage.php @@ -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); |