From: Robin Appelman <robin@icewind.nl>
Date: Wed, 3 Jan 2024 13:41:58 +0000 (+0100)
Subject: use deletion time instead of mtime in trashbin handling
X-Git-Tag: v29.0.0beta1~527^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F42558%2Fhead;p=nextcloud-server.git

use deletion time instead of mtime in trashbin handling

Signed-off-by: Robin Appelman <robin@icewind.nl>
---

diff --git a/apps/files_trashbin/lib/Sabre/TrashFile.php b/apps/files_trashbin/lib/Sabre/TrashFile.php
index d9dc102ac83..a3351479487 100644
--- a/apps/files_trashbin/lib/Sabre/TrashFile.php
+++ b/apps/files_trashbin/lib/Sabre/TrashFile.php
@@ -30,10 +30,10 @@ use OCA\Files_Trashbin\Trashbin;
 
 class TrashFile extends AbstractTrashFile {
 	public function get() {
-		return $this->data->getStorage()->fopen(Trashbin::getTrashFilename($this->data->getInternalPath(), $this->getLastModified()), 'rb');
+		return $this->data->getStorage()->fopen(Trashbin::getTrashFilename($this->data->getInternalPath(), $this->getDeletionTime()), 'rb');
 	}
 
 	public function getName(): string {
-		return Trashbin::getTrashFilename($this->data->getName(), $this->getLastModified());
+		return Trashbin::getTrashFilename($this->data->getName(), $this->getDeletionTime());
 	}
 }
diff --git a/apps/files_trashbin/lib/Sabre/TrashFolder.php b/apps/files_trashbin/lib/Sabre/TrashFolder.php
index 4623913b18a..fed39d67aa0 100644
--- a/apps/files_trashbin/lib/Sabre/TrashFolder.php
+++ b/apps/files_trashbin/lib/Sabre/TrashFolder.php
@@ -30,6 +30,6 @@ use OCA\Files_Trashbin\Trashbin;
 
 class TrashFolder extends AbstractTrashFolder {
 	public function getName(): string {
-		return Trashbin::getTrashFilename($this->data->getName(), $this->getLastModified());
+		return Trashbin::getTrashFilename($this->data->getName(), $this->getDeletionTime());
 	}
 }