Skip to content

Commit b2540e4

Browse files
committed
don't error if we can't find a trashbin item for a file when looking for relevant acl paths
Signed-off-by: Robin Appelman <[email protected]>
1 parent e0b5686 commit b2540e4

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

lib/ACL/ACLManager.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,11 @@ private function getRelevantPaths(string $path): array {
116116
if ($fromTrashbin && ($path === '__groupfolders/trash')) {
117117
/* We are in trash and hit the root folder, continue looking for ACLs on parent folders in original location */
118118
$trashItemRow = $this->trashManager->getTrashItemByFileName($groupFolderId, $rootTrashedItemName, $rootTrashedItemDate);
119-
$path = dirname('__groupfolders/' . $groupFolderId . '/' . $trashItemRow['original_location']);
120119
$fromTrashbin = false;
121-
continue;
120+
if ($trashItemRow) {
121+
$path = dirname('__groupfolders/' . $groupFolderId . '/' . $trashItemRow['original_location']);
122+
continue;
123+
}
122124
}
123125

124126
if ($path === '.' || $path === '/') {

0 commit comments

Comments
 (0)