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 3 years ago
parent ec465bf247
commit 6f6ccfcc18
  1. 6
      apps/files_trashbin/lib/Command/RestoreAllFiles.php

@ -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");

Loading…
Cancel
Save