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

Sort files by deletion time before restoring in RestoreAllFiles 

Restoring in order of most recently deleted preserves nested file paths.
See https://github.com/nextcloud/server/issues/31200#issuecomment-1130358549

Signed-off-by: Carl Csaposs <carl@csaposs.com>
pull/32507/head
Carl Csaposs 2022-05-20 00:43:12 +07:00
parent ec465bf247
commit 6f6ccfcc18
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files_trashbin/lib/Command/RestoreAllFiles.php
Unescape Escape View File

@ -129,7 +129,11 @@ class RestoreAllFiles extends Base {
\OC_Util::setupFS($uid);
\OC_User::setUserId($uid);
$filesInTrash = Helper::getTrashFiles('/', $uid, 'mtime');
// Sort by most recently deleted first
// (Restoring in order of most recently deleted preserves nested file paths.
// See https://github.com/nextcloud/server/issues/31200#issuecomment-1130358549)
$filesInTrash = Helper::getTrashFiles('/', $uid, 'mtime', true);
$trashCount = count($filesInTrash);
if ($trashCount == 0) {
$output->writeln("User has no deleted files in the trashbin");