Skip to content

Commit

Permalink
Merge pull request #25277 from nextcloud/backport/25274/stable19
Browse files Browse the repository at this point in the history
[stable19] Do not obtain userFolder of a federated user
  • Loading branch information
MorrisJobke authored Jan 22, 2021
2 parents 7f3faa7 + 2f0948e commit e95f6a8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion apps/files_trashbin/lib/Storage.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ protected function shouldMoveToTrash($path) {
// 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);
Expand Down

0 comments on commit e95f6a8

Please sign in to comment.