summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-01-21 16:01:24 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-01-21 16:01:24 +0100
commitc57c9eae769b70a1b273c564b76d57d95ebcf2ab (patch)
tree66037605a6841aff185bcf183b4c81f23db6ff93 /lib
parenta3ea5aa2ac85fea812e25e2578db4cf86a0d3418 (diff)
parent98415d68a5127bc0928455ecff230f53cf990686 (diff)
downloadnextcloud-server-c57c9eae769b70a1b273c564b76d57d95ebcf2ab.tar.gz
nextcloud-server-c57c9eae769b70a1b273c564b76d57d95ebcf2ab.zip
Merge branch 'master' into fixing-gallery-password-protected-access-master
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files.php b/lib/private/files.php
index e6c81d58bd2..8ce632013cf 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -83,7 +83,7 @@ class OC_Files {
if ($basename) {
$name = $basename . '.zip';
} else {
- $name = 'owncloud.zip';
+ $name = 'download.zip';
}
set_time_limit($executionTime);