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

Also catch exceptions on encryptAll and reset trashbin and singleUser mode

remotes/origin/db-empty-migrate
Joas Schilling 2015-09-18 15:05:18 +07:00
parent 2f102c1f0d
commit 5472a5f455
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/command/encryption/encryptall.php
Unescape Escape View File

@ -115,8 +115,13 @@ class EncryptAll extends Command {
if ($this->questionHelper->ask($input, $output, $question)) {
$this->forceSingleUserAndTrashbin();
$defaultModule = $this->encryptionManager->getEncryptionModule();
$defaultModule->encryptAll($input, $output);
try {
$defaultModule = $this->encryptionManager->getEncryptionModule();
$defaultModule->encryptAll($input, $output);
} catch (\Exception $ex) {
$this->resetSingleUserAndTrashbin();
throw $ex;
}
$this->resetSingleUserAndTrashbin();
} else {