aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/legacy/files.php
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-11-28 14:56:18 +0100
committerGitHub <noreply@github.com>2016-11-28 14:56:18 +0100
commit6cd02a7f432032868cdec71d9a391c943b50b853 (patch)
tree7fff02d13bd10f8698c0c37f8d2ccff452750c5f /lib/private/legacy/files.php
parent3950ce9223927c66eb9f3f9f82475a19af617ed4 (diff)
parent6b8c45d05afbd7cd4e4e762ee0c71a39c0d80b34 (diff)
downloadnextcloud-server-6cd02a7f432032868cdec71d9a391c943b50b853.tar.gz
nextcloud-server-6cd02a7f432032868cdec71d9a391c943b50b853.zip
Merge pull request #2367 from nextcloud/issue-2349-keep-filemtime-for-zip-downloads
Keep the filemtime for files when downloading them in a zip/tar
Diffstat (limited to 'lib/private/legacy/files.php')
-rw-r--r--lib/private/legacy/files.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/legacy/files.php b/lib/private/legacy/files.php
index 064fa9e1d7a..b6c6857a1bf 100644
--- a/lib/private/legacy/files.php
+++ b/lib/private/legacy/files.php
@@ -153,8 +153,9 @@ class OC_Files {
$file = $dir . '/' . $file;
if (\OC\Files\Filesystem::is_file($file)) {
$fileSize = \OC\Files\Filesystem::filesize($file);
+ $fileTime = \OC\Files\Filesystem::filemtime($file);
$fh = \OC\Files\Filesystem::fopen($file, 'r');
- $streamer->addFileFromStream($fh, basename($file), $fileSize);
+ $streamer->addFileFromStream($fh, basename($file), $fileSize, $fileTime);
fclose($fh);
} elseif (\OC\Files\Filesystem::is_dir($file)) {
$streamer->addDirRecursive($file);