summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-03-07 11:37:49 +0100
committerVincent Petry <pvince81@owncloud.com>2016-03-07 21:50:41 +0100
commitf9a14e5c548537c07e6b15c10798084e33f3b2c8 (patch)
tree01cdfc47f38ecd0585571943d739e4371e5bd84a /apps
parentc51ae5f8ee26c2d1440ed64eee9c48bfd6987e2d (diff)
downloadnextcloud-server-f9a14e5c548537c07e6b15c10798084e33f3b2c8.tar.gz
nextcloud-server-f9a14e5c548537c07e6b15c10798084e33f3b2c8.zip
Fix archive file name when downloading public share
When download a public link share folder using the button on the top right, it doesn't provide a list of files. This fix makes sure to trigger the correct logic when no file list was given.
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/lib/controllers/sharecontroller.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index 4d227e78ff7..220da77cdaf 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -304,7 +304,7 @@ class ShareController extends Controller {
}
// 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');