From 95b18e2074af434aa3fed97b11152431cadb5188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <91878298+come-nc@users.noreply.github.com> Date: Tue, 12 Dec 2023 17:28:58 +0100 Subject: [PATCH] Make it clearer that we search the original location in the same groupfolder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Louis Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com> --- lib/ACL/ACLManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ACL/ACLManager.php b/lib/ACL/ACLManager.php index 74c76a5ba..44dcd03f8 100644 --- a/lib/ACL/ACLManager.php +++ b/lib/ACL/ACLManager.php @@ -116,7 +116,7 @@ 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/' . $trashItemRow['folder_id'] . '/' . $trashItemRow['original_location']); + $path = dirname('__groupfolders/' . $groupFolderId . '/' . $trashItemRow['original_location']); $fromTrashbin = false; continue; }