diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-11-30 00:18:42 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-11-30 00:18:42 +0100 |
| commit | d33f697a5f3438f286ba3abe63255b6797a6fc03 (patch) | |
| tree | 3bde00fb82540d9a44d0cfe97b41a7c6ecc668d3 /lib/files.php | |
| parent | a609992a75d1dad15398f55e22ad2244c78650dc (diff) | |
| parent | 9b709fa95df5b93b9fb05e33158122003891c154 (diff) | |
| download | nextcloud-server-d33f697a5f3438f286ba3abe63255b6797a6fc03.tar.gz nextcloud-server-d33f697a5f3438f286ba3abe63255b6797a6fc03.zip | |
merge master into filesystem
Diffstat (limited to 'lib/files.php')
| -rw-r--r-- | lib/files.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/files.php b/lib/files.php index 323d7ddb7e8..a2387368241 100644 --- a/lib/files.php +++ b/lib/files.php @@ -99,7 +99,7 @@ class OC_Files { $zip = false; $filename = $dir . '/' . $files; } - @ob_end_clean(); + OC_Util::obEnd(); if ($zip or \OC\Files\Filesystem::isReadable($filename)) { header('Content-Disposition: attachment; filename="' . basename($filename) . '"'); header('Content-Transfer-Encoding: binary'); |