From d600955a51a9536ac9ebfa7198ef963679153740 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 20 Apr 2015 11:11:52 +0200 Subject: Make getDefaultModuleId public and get module protected --- settings/admin.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'settings') diff --git a/settings/admin.php b/settings/admin.php index f08c3cd53b6..b8d8c67d0f7 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -86,14 +86,10 @@ $backends = \OC::$server->getUserManager()->getBackends(); $externalBackends = (count($backends) > 1) ? true : false; $template->assign('encryptionReady', \OC::$server->getEncryptionManager()->isReady()); $template->assign('externalBackendsEnabled', $externalBackends); + $encryptionModules = \OC::$server->getEncryptionManager()->getEncryptionModules(); +$defaultEncryptionModuleId = \OC::$server->getEncryptionManager()->getDefaultEncryptionModuleId(); -try { - $defaultEncryptionModule = \OC::$server->getEncryptionManager()->getDefaultEncryptionModule(); - $defaultEncryptionModuleId = $defaultEncryptionModule->getId(); -} catch (Exception $e) { - $defaultEncryptionModuleId = null; -} $encModulues = array(); foreach ($encryptionModules as $module) { $encModulues[$module['id']]['displayName'] = $module['displayName']; -- cgit v1.2.3