summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSergio Bertolín <sbertolin@solidgear.es>2016-06-07 07:55:28 +0000
committerSergio Bertolín <sbertolin@solidgear.es>2016-06-07 07:55:28 +0000
commit67c9e598aed8479ff1e46e55563e8582e2299705 (patch)
tree7a1c92d55852cd8af830014da20d135ff8fbeb4d /core
parentf9b386509384c3d8c0c355d45c2c4f7a56c846ef (diff)
downloadnextcloud-server-67c9e598aed8479ff1e46e55563e8582e2299705.tar.gz
nextcloud-server-67c9e598aed8479ff1e46e55563e8582e2299705.zip
Fixed reviews
Diffstat (limited to 'core')
-rw-r--r--core/Command/Encryption/DecryptAll.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Command/Encryption/DecryptAll.php b/core/Command/Encryption/DecryptAll.php
index e9cae29e825..68dee845f15 100644
--- a/core/Command/Encryption/DecryptAll.php
+++ b/core/Command/Encryption/DecryptAll.php
@@ -129,7 +129,7 @@ class DecryptAll extends Command {
$uid = $input->getArgument('user');
//FIXME WHEN https://github.com/owncloud/core/issues/24994 is fixed
- if (empty($uid)) {
+ if ($uid === null) {
$message = 'your ownCloud';
} else {
$message = "$uid's account";
@@ -148,7 +148,7 @@ class DecryptAll extends Command {
$result = $this->decryptAll->decryptAll($input, $output, $user);
if ($result === false) {
$output->writeln(' aborted.');
- $output->writeln('Enable server side encryption... ');
+ $output->writeln('Server side encryption remains enabled');
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
}
$this->resetSingleUserAndTrashbin();