diff options
| author | blizzz <blizzz@owncloud.com> | 2015-11-02 13:32:24 +0100 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2015-11-02 13:32:24 +0100 |
| commit | 83d3c94590aa877fe23a5d49c991e617d76a6060 (patch) | |
| tree | 88813a6c5e13381bf8a23723862a6b7d7ea56a92 /apps/files/js | |
| parent | 16aa33947581959eeb9a89530ad0152cb2c33c25 (diff) | |
| parent | a8641fdc9559d67696fb612597c4b27d1832220a (diff) | |
| download | nextcloud-server-83d3c94590aa877fe23a5d49c991e617d76a6060.tar.gz nextcloud-server-83d3c94590aa877fe23a5d49c991e617d76a6060.zip | |
Merge branch 'master' into fix-20151
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/fileactions.js | 2 | ||||
| -rw-r--r-- | apps/files/js/files.js | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 079c5330ec2..6a767d48a28 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -589,7 +589,7 @@ context.fileList.showFileBusyState(filename, false); }; - context.fileList.showFileBusyState(downloadFileaction, true); + context.fileList.showFileBusyState(filename, true); OCA.Files.Files.handleDownload(url, disableLoadingState); } } diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 9ab7609cc40..ae38511ec05 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -295,7 +295,12 @@ } }; - OC.redirect(url + '&downloadStartSecret=' + randomToken); + if (url.indexOf('?') >= 0) { + url += '&'; + } else { + url += '?'; + } + OC.redirect(url + 'downloadStartSecret=' + randomToken); OC.Util.waitFor(checkForDownloadCookie, 500); } }; |