aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2016-08-16 18:26:16 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2016-08-16 18:26:16 +0200
commit4946cc220de5926ef86dc8557ffb5c990f6482d3 (patch)
tree1e091e2ec886c9a7fa24d9c07c83bbc035ca453e
parentf76b64d3d7e5803008e0dbc29fdf1bcf29f0811e (diff)
downloadnextcloud-server-4946cc220de5926ef86dc8557ffb5c990f6482d3.tar.gz
nextcloud-server-4946cc220de5926ef86dc8557ffb5c990f6482d3.zip
for new we cannot have nested settings, default module is only appended if available
-rw-r--r--apps/encryption/templates/settings-admin.php1
-rw-r--r--settings/templates/admin/encryption.php2
2 files changed, 1 insertions, 2 deletions
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index 5c551267ff5..405dbaf703f 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -6,6 +6,7 @@ script('core', 'multiselect');
style('encryption', 'settings-admin');
?>
<form id="ocDefaultEncryptionModule" class="sub-section">
+ <h3><?php p($l->t("Default encryption module")); ?></h3>
<?php if(!$_["initStatus"]): ?>
<?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?>
<?php else: ?>
diff --git a/settings/templates/admin/encryption.php b/settings/templates/admin/encryption.php
index d4c3be8b2c8..4b6d9045689 100644
--- a/settings/templates/admin/encryption.php
+++ b/settings/templates/admin/encryption.php
@@ -72,8 +72,6 @@
<label
for="<?php p($id) ?>"><?php p($module['displayName']) ?></label>
<br/>
-
- <?php if ($id === 'OC_DEFAULT_MODULE') print_unescaped($_['ocDefaultEncryptionModulePanel']); ?>
<?php endforeach; ?>
</fieldset>
<?php } ?>