From 2cb342c3b875719017e40063f20342000422db12 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 18 Mar 2014 11:28:56 +0100
Subject: [PATCH] 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.

Backport of b75ca9f from master
---
 settings/templates/admin.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 0eabffb9316..0c6dcbc2a1f 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -178,7 +178,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"
@@ -187,7 +186,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"