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 #25263 from owncloud/decryptall-keepencryptionenabledforsingleuser 

Keep encryption enabled if decrypting for single user
pull/350/head
Christoph Wurst 2016-06-27 12:19:45 +07:00 committed by GitHub
parent 199c8e304c f062b62f03
commit b14376419d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/Command/Encryption/DecryptAll.php
Unescape Escape View File

@ -150,6 +150,9 @@ class DecryptAll extends Command {
$output->writeln(' aborted.');
$output->writeln('Server side encryption remains enabled');
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
} else if ($uid !== '') {
$output->writeln('Server side encryption remains enabled');
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
}
$this->resetSingleUserAndTrashbin();
} else {