diff options
author | Robin Appelman <icewind@owncloud.com> | 2012-10-11 22:54:39 +0200 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2012-10-11 22:54:39 +0200 |
commit | fb2d2bc2011c371ff1e4334f84494f15a84a07a2 (patch) | |
tree | b5c20c842441ce4288038909daa5a158c8e74e80 /apps/files_sharing/js/share.js | |
parent | 5c6e9518edde10e0c23d0d734d2cc6d161fc15c0 (diff) | |
parent | ee28e35ba93032a3d43601c030d3d44df9b092f0 (diff) | |
download | nextcloud-server-fb2d2bc2011c371ff1e4334f84494f15a84a07a2.tar.gz nextcloud-server-fb2d2bc2011c371ff1e4334f84494f15a84a07a2.zip |
merge master into filesystem
Diffstat (limited to 'apps/files_sharing/js/share.js')
-rw-r--r-- | apps/files_sharing/js/share.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index bc94d78fb76..72663c068c9 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -1,6 +1,6 @@ $(document).ready(function() { - if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined') { + if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !publicListView) { OC.Share.loadIcons('file'); FileActions.register('all', 'Share', OC.PERMISSION_READ, function(filename) { // Return the correct sharing icon |