diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2016-06-27 12:19:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-27 12:19:45 +0200 |
| commit | b14376419d2ca9ba541dfcc1ea7c9fc7a99394cd (patch) | |
| tree | 22499336edd4c8985c73059f43882d03ac61e79b | |
| parent | 199c8e304c261cd0f32a320c2d8ec6c8ce2a45c6 (diff) | |
| parent | f062b62f0396b50436070426ad9d10b853543c3f (diff) | |
| download | nextcloud-server-b14376419d2ca9ba541dfcc1ea7c9fc7a99394cd.tar.gz nextcloud-server-b14376419d2ca9ba541dfcc1ea7c9fc7a99394cd.zip | |
Merge pull request #25263 from owncloud/decryptall-keepencryptionenabledforsingleuser
Keep encryption enabled if decrypting for single user
| -rw-r--r-- | core/Command/Encryption/DecryptAll.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/Command/Encryption/DecryptAll.php b/core/Command/Encryption/DecryptAll.php index 83c6c1dc168..cda7853b8b4 100644 --- a/core/Command/Encryption/DecryptAll.php +++ b/core/Command/Encryption/DecryptAll.php @@ -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 { |