for new we cannot have nested settings, default module is only appended if available

diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index 5c551267ff5f00e13d0914cb140f7a9ae0640b58..405dbaf703f385ea7571ae25005142a4b7139b0d 100644 (file)
--- 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 d4c3be8b2c8701edb9434eb9259e78318bc998a3..4b6d9045689bc24489ddb381d0af0465299a7deb 100644 (file)
--- 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 } ?>