summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authordavitol <dtoledo@solidgear.es>2016-06-06 16:10:49 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2016-06-09 13:59:59 +0200
commit3b5c169869839946b8cb9aee0c919c7ac0008528 (patch)
tree0f2bde0a546c9c2d67320efb4141154d4127d704 /core
parentad33992eb9eafe16a8a35b8bffe1cf72bc27569c (diff)
downloadnextcloud-server-3b5c169869839946b8cb9aee0c919c7ac0008528.tar.gz
nextcloud-server-3b5c169869839946b8cb9aee0c919c7ac0008528.zip
Comments fixed
Diffstat (limited to 'core')
-rw-r--r--core/Command/Encryption/DecryptAll.php5
1 files 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();