mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22922 from owncloud/stable9-share-archivenamedownloadall 

[stable9] Fix archive file name when downloading public share
This commit is contained in:
Thomas Müller 2016-03-09 12:26:18 +01:00
parent d652c87f86 ebfc8b67d7
commit c2a16e0584
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files_sharing/js/public.js
View File

@ -158,9 +158,11 @@ OCA.Sharing.PublicApp = {
filename = JSON.stringify(filename);
}
var params = {
path: path,
files: filename
path: path
};
if (filename) {
params.files = filename;
}
return OC.generateUrl('/s/' + token + '/download') + '?' + OC.buildQueryString(params);
};

2
apps/files_sharing/lib/controllers/sharecontroller.php
View File

@ -479,7 +479,7 @@ class ShareController extends Controller {
$this->emitAccessShareHook($share);
// download selected files
if (!is_null($files)) {
if (!is_null($files) && $files !== '') {
// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
// after dispatching the request which results in a "Cannot modify header information" notice.
OC_Files::get($originalSharePath, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');