Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Schiessle <bjoern@schiessle.org>2017-05-30 14:22:27 +0300
committerBjoern Schiessle <bjoern@schiessle.org>2017-07-06 12:47:11 +0300
commit5f75468aa4341672e3a805ab5ce2ae03ba7402cc (patch)
tree1eafc930e978640e8aa4b78797e95fa9085fb934 /apps/encryption/templates
parent28a7e72868017fb545e8303f32c1204ffc4cc8c1 (diff)
improve status messages
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'apps/encryption/templates')
-rw-r--r--apps/encryption/templates/settings-admin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index efe9c44ece7..c5f8d9f5536 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -7,7 +7,7 @@ style('encryption', 'settings-admin');
?>
<form id="ocDefaultEncryptionModule" class="sub-section">
<h3><?php p($l->t("Default encryption module")); ?></h3>
- <?php if(!$_["initStatus"]): ?>
+ <?php if(!$_["initStatus"] && $_['masterKeyEnabled'] === false): ?>
<?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?>
<?php else: ?>
<p id="encryptHomeStorageSetting">