summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2015-04-18 10:20:13 +0200
committerJoas Schilling <nickvergessen@owncloud.com>2015-04-18 10:20:13 +0200
commitb5c5775626451304f8b3f0cfd0bcc8e5dbc63c94 (patch)
treefc0201141df2b7f8adcc54b6b60c27f52d77abdf
parent4d238c3949894f464575aea626b14053a25cb7d6 (diff)
downloadnextcloud-server-b5c5775626451304f8b3f0cfd0bcc8e5dbc63c94.tar.gz
nextcloud-server-b5c5775626451304f8b3f0cfd0bcc8e5dbc63c94.zip
Fix potential undefined variable
-rw-r--r--settings/admin.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/settings/admin.php b/settings/admin.php
index 773e8276534..94e48aab14e 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -92,13 +92,13 @@ try {
$defaultEncryptionModule = \OC::$server->getEncryptionManager()->getDefaultEncryptionModule();
$defaultEncryptionModuleId = $defaultEncryptionModule->getId();
} catch (Exception $e) {
- $defaultEncryptionModule = null;
+ $defaultEncryptionModuleId = null;
}
$encModulues = array();
foreach ($encryptionModules as $module) {
$encModulues[$module['id']]['displayName'] = $module['displayName'];
$encModulues[$module['id']]['default'] = false;
- if ($defaultEncryptionModule && $module['id'] === $defaultEncryptionModuleId) {
+ if ($module['id'] === $defaultEncryptionModuleId) {
$encModulues[$module['id']]['default'] = true;
}
}