diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2021-01-22 16:16:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 16:16:35 +0100 |
| commit | e95f6a85b2eece29377f2fe50d0ff0c7466a9592 (patch) | |
| tree | 0e4e6f873de033e1914049dafa4ccd824c200b94 | |
| parent | 7f3faa71658ca802f69889b8a025911b1397cda3 (diff) | |
| parent | 2f0948ed151297638803c3609aeea6092e89707f (diff) | |
| download | nextcloud-server-e95f6a85b2eece29377f2fe50d0ff0c7466a9592.tar.gz nextcloud-server-e95f6a85b2eece29377f2fe50d0ff0c7466a9592.zip | |
Merge pull request #25277 from nextcloud/backport/25274/stable19
[stable19] Do not obtain userFolder of a federated user
| -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 4ac597717e7..c87fbe2800c 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); |