Merge branch 'master' into disable-anon-upload-master

Conflicts:
	settings/templates/admin.php

diff --cc settings/admin.php
Simple merge

diff --cc settings/templates/admin.php
index 22c0b2b5f2f21b6bed20cf20253f2e2a6d2dc5df,d638a26c3fa41db553984afc9bfaca0c35767d5b..057d527db738058c2484d1a5002bca071f0b0cf3
--- 1/settings/templates/admin.php
--- 2/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@@ -145,20 -145,10 +145,20 @@@ 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('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 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"');?>>
+                       <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>>
                                <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
-                                          value="1" <?php if ($_['allowResharing'] == 'yes') print_unescaped('checked="checked"'); ?> />
+                                          value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
                                <label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
                                <em><?php p($l->t('Allow users to share items shared with them again')); ?></em>
                        </td>