summaryrefslogtreecommitdiffstats
path: root/apps/encryption/settings
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2016-03-02 19:38:21 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2016-03-03 12:16:39 +0100
commitb6050b44c27e74d87c813f108976c62a0fa31cb9 (patch)
treebe53474f83e45b4370dd8748b3bf6e3bcf86c2a6 /apps/encryption/settings
parent4f25f341788b3edad1bf4baf739cd632785c9abb (diff)
downloadnextcloud-server-b6050b44c27e74d87c813f108976c62a0fa31cb9.tar.gz
nextcloud-server-b6050b44c27e74d87c813f108976c62a0fa31cb9.zip
disable the recovery key if the master key is enabled
Diffstat (limited to 'apps/encryption/settings')
-rw-r--r--apps/encryption/settings/settings-admin.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/encryption/settings/settings-admin.php b/apps/encryption/settings/settings-admin.php
index 6c7c0987fd7..79e900ebbdc 100644
--- a/apps/encryption/settings/settings-admin.php
+++ b/apps/encryption/settings/settings-admin.php
@@ -49,5 +49,6 @@ $encryptHomeStorage = $util->shouldEncryptHomeStorage();
$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
$tmpl->assign('initStatus', $session->getStatus());
$tmpl->assign('encryptHomeStorage', $encryptHomeStorage);
+$tmpl->assign('masterKeyEnabled', $util->isMasterKeyEnabled());
return $tmpl->fetchPage();