diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-01-22 14:36:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 14:36:20 +0100 |
| commit | 4c10b59404cf6507ba697ce9bf99434b799f5865 (patch) | |
| tree | c0dc564123892d114dc41b9a6a130f2285bcc03a /apps | |
| parent | 939433363ebcbad6212e4fe0413183a190a92eb0 (diff) | |
| parent | a0988281eed23da87ad2d39d8bce5a3935bd3dc9 (diff) | |
| download | nextcloud-server-4c10b59404cf6507ba697ce9bf99434b799f5865.tar.gz nextcloud-server-4c10b59404cf6507ba697ce9bf99434b799f5865.zip | |
Merge pull request #25274 from nextcloud/fix/19647/federated_users_are_not_valid_users
Do not obtain userFolder of a federated user
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); |