diff options
| author | Robin Appelman <robin@icewind.nl> | 2024-01-10 14:28:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-10 14:28:09 +0100 |
| commit | 62506a4e8de97dc9909d83029f47e78afce99371 (patch) | |
| tree | 39ac8c4c2edb2af7bc31b132037982445f5a2741 | |
| parent | 50aeae6a858094d86d93d0db12889ca98d226ab0 (diff) | |
| parent | 60dfe31d5d4802f06b1b4fe243f0a821c01a99a9 (diff) | |
| download | nextcloud-server-62506a4e8de97dc9909d83029f47e78afce99371.tar.gz nextcloud-server-62506a4e8de97dc9909d83029f47e78afce99371.zip | |
Merge pull request #42558 from nextcloud/trash-mtime-deletion-time
use deletion time instead of mtime in trashbin handling
| -rw-r--r-- | apps/files_trashbin/lib/Sabre/TrashFile.php | 4 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/Sabre/TrashFolder.php | 2 |
2 files changed, 3 insertions, 3 deletions
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()); } } |