From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Sun, 14 Jul 2013 20:00:42 +0000 (+0200)
Subject: Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable... 
X-Git-Tag: v6.0.0alpha2~424^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2964027cad2003dada6fdda3c929fee3005480a4;p=nextcloud-server.git

Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master
---

2964027cad2003dada6fdda3c929fee3005480a4
diff --cc settings/templates/admin.php
index 6c4fddd375d,397616a0a08..22c0b2b5f2f
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@@ -150,11 -149,10 +150,11 @@@ if (!$_['internetconnectionworking']) 
  			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
  				<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload"
  				       value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
- 				<label for="allowPublicUpload"><?php p($l->t('Allow anonymous uploads'));?></label><br/>
- 				<em><?php p($l->t('Allow users to enable others to anonymously upload into their publicly shared folders')); ?></em>
+ 				<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
+ 				<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('style="display:none"');?>>
  				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"