[Pkg-owncloud-commits] [owncloud] 55/165: Fix potential undefined variable

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit b5c5775626451304f8b3f0cfd0bcc8e5dbc63c94
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Sat Apr 18 10:20:13 2015 +0200

    Fix potential undefined variable
---
 settings/admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/admin.php b/settings/admin.php
index 773e827..94e48aa 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;
 	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git