diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-06-24 16:46:25 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-06-24 16:46:25 +0200 |
| commit | f062b62f0396b50436070426ad9d10b853543c3f (patch) | |
| tree | 22c2fad16f55674b8e1720365665e8b8ff9a359d /core/Command | |
| parent | 04e3da0cf51f23b501eaef34e4be771b15c6e6d2 (diff) | |
| download | nextcloud-server-f062b62f0396b50436070426ad9d10b853543c3f.tar.gz nextcloud-server-f062b62f0396b50436070426ad9d10b853543c3f.zip | |
Keep encryption enabled if decrypting for single user
When decrypting all files of a single user, the admin usually does not
intend encryption to be suddenly disabled for everyone. This fix
reenables encryption after decrypting for a single user.
Decrypting for all users will still disable encryption globally.
Diffstat (limited to 'core/Command')
| -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 { |