diff options
| author | tomneedham <tom@owncloud.com> | 2013-12-11 09:12:47 +0000 |
|---|---|---|
| committer | tomneedham <tom@owncloud.com> | 2013-12-11 09:12:47 +0000 |
| commit | 7afe6b349352f90bec5a8409bf5c23494f808f1a (patch) | |
| tree | c0e4294c123a42b519ac168259a113efadbebed7 /lib/private/files.php | |
| parent | 37b07fe6a9e512214852584fb15056f008509882 (diff) | |
| parent | 28180485d9d767a081656e403fe7c8210957f976 (diff) | |
| download | nextcloud-server-7afe6b349352f90bec5a8409bf5c23494f808f1a.tar.gz nextcloud-server-7afe6b349352f90bec5a8409bf5c23494f808f1a.zip | |
Merge branch 'master' into fix-5388-master
Diffstat (limited to 'lib/private/files.php')
| -rw-r--r-- | lib/private/files.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/files.php b/lib/private/files.php index 8b8ff81ec5e..6ffa14c0d91 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -109,6 +109,9 @@ class OC_Files { $zip = false; $filename = $dir . '/' . $files; $name = $files; + if ($xsendfile && OC_App::isEnabled('files_encryption')) { + $xsendfile = false; + } } OC_Util::obEnd(); if ($zip or \OC\Files\Filesystem::isReadable($filename)) { |