fix: use "full" target folder from user when restoring trash items

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Nov 13, 2024 · 3e0d465 · 3e0d465
1 parent d1d4a6e
commit 3e0d465
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/Trash/TrashBackend.php b/lib/Trash/TrashBackend.php
@@ -102,6 +102,7 @@ public function restoreItem(ITrashItem $item): void {
 		}
 
 		$user = $item->getUser();
+		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 		[, $folderId] = explode('/', $item->getTrashPath());
 		$node = $this->getNodeForTrashItem($user, $item);
 		if ($node === null) {
@@ -119,7 +120,7 @@ public function restoreItem(ITrashItem $item): void {
 
 		$trashStorage = $node->getStorage();
 		/** @var Folder $targetFolder */
-		$targetFolder = $this->mountProvider->getFolder((int)$folderId);
+		$targetFolder = $userFolder->get($item->getGroupFolderMountPoint());
 		$originalLocation = $item->getInternalOriginalLocation();
 		$parent = dirname($originalLocation);
 		if ($parent === '.') {