summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-03-18 11:28:56 +0100
committerVincent Petry <pvince81@owncloud.com>2014-03-18 11:28:56 +0100
commitb75ca9fb50d085d0e5f2547be7d7812701ef0040 (patch)
tree4ef43cad35b2779ed22e7b87b0e168d6637b67c9
parentd744e2c1760c959918597ee814a9a70442a5c3b1 (diff)
downloadnextcloud-server-b75ca9fb50d085d0e5f2547be7d7812701ef0040.tar.gz
nextcloud-server-b75ca9fb50d085d0e5f2547be7d7812701ef0040.zip
Display admin option for public upload with encryption enabled
Now that public upload works with encryption, the admin option to toggle it must be made visible.
-rw-r--r--settings/templates/admin.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5ed42eab0ff..6e816c1fff6 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -203,7 +203,6 @@ if (!$_['internetconnectionworking']) {
<em><?php p($l->t('Allow users to share items to the public with links')); ?></em>
</td>
</tr>
- <?php if (!\OCP\App::isEnabled('files_encryption')) { ?>
<tr>
<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('class="hidden"');?>>
<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload"
@@ -212,7 +211,6 @@ if (!$_['internetconnectionworking']) {
<em><?php p($l->t('Allow users to enable others to upload into their publicly shared folders')); ?></em>
</td>
</tr>
- <?php } ?>
<tr>
<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"