From f9b386509384c3d8c0c355d45c2c4f7a56c846ef Mon Sep 17 00:00:00 2001 From: davitol Date: Mon, 6 Jun 2016 16:10:49 +0200 Subject: [PATCH] Comments fixed --- core/Command/Encryption/DecryptAll.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/Command/Encryption/DecryptAll.php b/core/Command/Encryption/DecryptAll.php index 26dbe79b5cc..e9cae29e825 100644 --- a/core/Command/Encryption/DecryptAll.php +++ b/core/Command/Encryption/DecryptAll.php @@ -118,8 +118,6 @@ class DecryptAll extends Command { protected function execute(InputInterface $input, OutputInterface $output) { try { - - if ($this->encryptionManager->isEnabled() === true) { $output->write('Disable server side encryption... '); $this->config->setAppValue('core', 'encryption_enabled', 'no'); @@ -130,6 +128,7 @@ class DecryptAll extends Command { } $uid = $input->getArgument('user'); + //FIXME WHEN https://github.com/owncloud/core/issues/24994 is fixed if (empty($uid)) { $message = 'your ownCloud'; } else { @@ -149,7 +148,7 @@ class DecryptAll extends Command { $result = $this->decryptAll->decryptAll($input, $output, $user); if ($result === false) { $output->writeln(' aborted.'); - $output->write('Enable server side encryption... '); + $output->writeln('Enable server side encryption... '); $this->config->setAppValue('core', 'encryption_enabled', 'yes'); } $this->resetSingleUserAndTrashbin(); -- 2.39.5