summaryrefslogtreecommitdiffstats
path: root/settings/admin.php
diff options
context:
space:
mode:
Diffstat (limited to 'settings/admin.php')
-rw-r--r--settings/admin.php8
1 files changed, 2 insertions, 6 deletions
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'];