summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-01-28 00:29:46 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2013-01-28 00:29:46 -0800
commit31d83fddc482959d7fb4f7377cc7020c59c30951 (patch)
tree2294989764a9f87e8965a8ea8e71aadc5d09bfb4 /apps/files_sharing
parent44d6ff61e254635f055a1c92f12c653e5b1a1e7b (diff)
parent2e42c6f54f85c5ac5b339625d04685535ac69d40 (diff)
downloadnextcloud-server-31d83fddc482959d7fb4f7377cc7020c59c30951.tar.gz
nextcloud-server-31d83fddc482959d7fb4f7377cc7020c59c30951.zip
Merge pull request #1321 from owncloud/csp-fixes
Files: CSP fixes
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/js/share.js2
-rw-r--r--apps/files_sharing/templates/public.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 780b9c1bf6d..eb5a6e8cb7f 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -1,5 +1,7 @@
$(document).ready(function() {
+ 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) {
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 275360ac2a8..35cca7c42dc 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -1,5 +1,3 @@
-<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('publicListView');?>"></script>
-
<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
<input type="hidden" name="downloadURL" value="<?php echo $_['downloadURL'] ?>" id="downloadURL">
<input type="hidden" name="filename" value="<?php echo $_['filename'] ?>" id="filename">