Merge pull request #3362 from nextcloud/original-location-mp

fix: include mountpoint in original location for trash items
nextcloud · Oct 15, 2024 · a81c18c · a81c18c
2 parents 2994e18 + 5beeedd
commit a81c18c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/Trash/GroupTrashItem.php b/lib/Trash/GroupTrashItem.php
@@ -14,6 +14,8 @@
 use OCP\IUser;
 
 class GroupTrashItem extends TrashItem {
+	private string $internalOriginalLocation;
+
 	public function __construct(
 		ITrashBackend $backend,
 		string $originalLocation,
@@ -24,7 +26,12 @@ public function __construct(
 		private string $mountPoint,
 		?IUser $deletedBy,
 	) {
-		parent::__construct($backend, $originalLocation, $deletedTime, $trashPath, $fileInfo, $user, $deletedBy);
+		$this->internalOriginalLocation = $originalLocation;
+		parent::__construct($backend, $this->mountPoint . '/' . $originalLocation, $deletedTime, $trashPath, $fileInfo, $user, $deletedBy);
+	}
+
+	public function getInternalOriginalLocation(): string {
+		return $this->internalOriginalLocation;
 	}
 
 	public function isRootItem(): bool {

diff --git a/lib/Trash/TrashBackend.php b/lib/Trash/TrashBackend.php
@@ -80,7 +80,7 @@ public function listTrashFolder(ITrashItem $folder): array {
 
 			return new GroupTrashItem(
 				$this,
-				$folder->getOriginalLocation() . '/' . $node->getName(),
+				$folder->getInternalOriginalLocation() . '/' . $node->getName(),
 				$folder->getDeletedTime(),
 				$folder->getTrashPath() . '/' . $node->getName(),
 				$node,
@@ -118,7 +118,7 @@ public function restoreItem(ITrashItem $item): void {
 		$trashStorage = $node->getStorage();
 		/** @var Folder $targetFolder */
 		$targetFolder = $this->mountProvider->getFolder((int)$folderId);
-		$originalLocation = $item->getOriginalLocation();
+		$originalLocation = $item->getInternalOriginalLocation();
 		$parent = dirname($originalLocation);
 		if ($parent === '.') {
 			$parent = '';