diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-04-20 11:11:52 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-04-27 11:03:51 +0200 |
| commit | d600955a51a9536ac9ebfa7198ef963679153740 (patch) | |
| tree | 3ff846f2b2e049de80c36bd2721bfa58eebb64a5 /settings/admin.php | |
| parent | 4e97228cde0016439b4cad9b118fae7380fb0874 (diff) | |
| download | nextcloud-server-d600955a51a9536ac9ebfa7198ef963679153740.tar.gz nextcloud-server-d600955a51a9536ac9ebfa7198ef963679153740.zip | |
Make getDefaultModuleId public and get module protected
Diffstat (limited to 'settings/admin.php')
| -rw-r--r-- | settings/admin.php | 8 |
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']; |