wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #25263 from owncloud/decryptall-keepencryptionenabledforsingleuser

Browse source 
Keep encryption enabled if decrypting for single user
This commit is contained in:
Christoph Wurst 2016-06-27 12:19:45 +02:00 committed by GitHub
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
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 {