Merge branch 'master' into fixing-3934-master

Conflicts:
	core/js/share.js

diff --cc core/js/share.js
index 778a9f8e2015638c141f2d469dce7057b3e174b8,9494637c3dc2f74685ec1fd57bd99747b8acaa96..ced1e0aa8ca9251feb869c7ee37f1bdb4a465433
--- 1/core/js/share.js
--- 2/core/js/share.js
+++ b/core/js/share.js
@@@ -181,13 -181,13 +181,13 @@@ OC.Share=
                                html += '<div id="linkPass">';
                                html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
                                html += '</div>';
-                 if (itemType == 'folder') {
 -                              if (possiblePermissions & OC.PERMISSION_CREATE) {
 -                                      html += '<div id="allowPublicUploadWrapper" style="display:none;">';
 -                                      html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
 -                                      html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
 -                                      html += '</div>';
 -                              }
 -                html += '</div><form id="emailPrivateLink" >';
++                if (itemType == 'folder' && (possiblePermissions & OC.PERMISSION_CREATE)) {
 +                    html += '<div id="allowPublicUploadWrapper" style="display:none;">';
 +                    html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
 +                    html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
 +                    html += '</div>';
 +                }
 +                              html += '</div><form id="emailPrivateLink" >';
                                html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
                                html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
                                html += '</form>';