summaryrefslogtreecommitdiffstats
path: root/lib/files.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2012-11-29 13:50:49 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2012-11-29 13:50:49 -0800
commit9b709fa95df5b93b9fb05e33158122003891c154 (patch)
tree4ffa9874347b40cb23552387fc0dc43c8a5d9c0d /lib/files.php
parentc38a75e03f9db02b82e71472d2f719079eb44829 (diff)
parentbcb27c81d479c49613094fe6c147af5bdea3ea3c (diff)
downloadnextcloud-server-9b709fa95df5b93b9fb05e33158122003891c154.tar.gz
nextcloud-server-9b709fa95df5b93b9fb05e33158122003891c154.zip
Merge pull request #635 from owncloud/ob_end
provide a safe way to end output buffering
Diffstat (limited to 'lib/files.php')
-rw-r--r--lib/files.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/files.php b/lib/files.php
index 912de5655b0..b4a4145a493 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -195,7 +195,7 @@ class OC_Files {
$zip=false;
$filename=$dir.'/'.$files;
}
- @ob_end_clean();
+ OC_Util::obEnd();
if($zip or OC_Filesystem::is_readable($filename)) {
header('Content-Disposition: attachment; filename="'.basename($filename).'"');
header('Content-Transfer-Encoding: binary');