sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42558 from nextcloud/trash-mtime-deletion-time 

use deletion time instead of mtime in trashbin handling
pull/42681/head
Robin Appelman 2024-01-10 14:28:09 +07:00 committed by GitHub
parent 50aeae6a85 60dfe31d5d
commit 62506a4e8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_trashbin/lib/Sabre/TrashFile.php
Unescape Escape View File

@ -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());
}
}

2
apps/files_trashbin/lib/Sabre/TrashFolder.php
Unescape Escape View File

@ -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());
}
}