Skip to content

Commit

Permalink
don't error if we can't find a trashbin item for a file when looking …
Browse files Browse the repository at this point in the history
…for relevant acl paths

Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
icewind1991 committed Jul 4, 2024
1 parent 56192c2 commit e1dbaa3
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions lib/ACL/ACLManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,11 @@ private function getRelevantPaths(string $path): array {
if ($fromTrashbin && ($path === '__groupfolders/trash')) {
/* We are in trash and hit the root folder, continue looking for ACLs on parent folders in original location */
$trashItemRow = $this->trashManager->getTrashItemByFileName($groupFolderId, $rootTrashedItemName, $rootTrashedItemDate);
$path = dirname('__groupfolders/' . $groupFolderId . '/' . $trashItemRow['original_location']);
$fromTrashbin = false;
continue;
if ($trashItemRow) {
$path = dirname('__groupfolders/' . $groupFolderId . '/' . $trashItemRow['original_location']);
continue;
}
}

if ($path === '.' || $path === '/') {
Expand Down

0 comments on commit e1dbaa3

Please sign in to comment.