aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/js
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-05-20 08:20:38 +0200
committerLukas Reschke <lukas@owncloud.com>2015-05-20 08:20:38 +0200
commit9be6d8cd39f2f6eed83de79280995606dbe5d3fa (patch)
tree26fdd6d05b99b18ad1d18099be703e7b2717f58e /apps/files_sharing/js
parentc49a06a68488b34fc7faf5dc3619516bb7b8cecf (diff)
parentf7a2b5e7a948f9bd8e5fcf5b642afad3fa84ae5d (diff)
downloadnextcloud-server-9be6d8cd39f2f6eed83de79280995606dbe5d3fa.tar.gz
nextcloud-server-9be6d8cd39f2f6eed83de79280995606dbe5d3fa.zip
Merge pull request #16446 from owncloud/fix-url-generation
Fix URL generation
Diffstat (limited to 'apps/files_sharing/js')
-rw-r--r--apps/files_sharing/js/public.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 79bd0bb0c47..c5934a4f609 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -144,7 +144,7 @@ OCA.Sharing.PublicApp = {
path: path,
files: filename
};
- return OC.generateUrl('/s/' + token + '/download', params);
+ return OC.generateUrl('/s/' + token + '/download') + '?' + OC.buildQueryString(params);
};
this.fileList.getAjaxUrl = function (action, params) {
@@ -277,6 +277,11 @@ OCA.Sharing.PublicApp = {
};
$(document).ready(function () {
+ // FIXME: replace with OC.Plugins.register()
+ if (window.TESTING) {
+ return;
+ }
+
var App = OCA.Sharing.PublicApp;
// defer app init, to give a chance to plugins to register file actions
_.defer(function () {