diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-01-31 16:30:37 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-01-31 16:30:37 +0000 |
| commit | 31e723a907399d7d33a0699da082164055f79b3e (patch) | |
| tree | 7da079cc3db0a46512da1b02cc19307337d9ce54 /apps/files_sharing/js/share.js | |
| parent | c7b1bdf00e65cca2a42d77fc5f27d0ea69e53be3 (diff) | |
| parent | 209d599ec5b00c5b92a33e902867fc621e725c93 (diff) | |
| download | nextcloud-server-31e723a907399d7d33a0699da082164055f79b3e.tar.gz nextcloud-server-31e723a907399d7d33a0699da082164055f79b3e.zip | |
Merge github.com:owncloud/core
Conflicts:
lib/public/share.php
Diffstat (limited to 'apps/files_sharing/js/share.js')
| -rw-r--r-- | apps/files_sharing/js/share.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index a46d0179801..eb5a6e8cb7f 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -1,6 +1,8 @@ $(document).ready(function() { - if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !publicListView) { + var disableSharing = $('#disableSharing').data('status'); + + if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !disableSharing) { FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) { if ($('#dir').val() == '/') { |