diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-10-11 20:41:53 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-10-11 20:41:53 +0000 |
| commit | b9e998170d28363e570d995369b73255f9570ae8 (patch) | |
| tree | 866527a5e8f6edbfc603e866a8e700bc2a12fd56 /includes | |
| parent | 2f83f862b635149c821741b4bebed29883de4f9c (diff) | |
| download | brdo-b9e998170d28363e570d995369b73255f9570ae8.tar.gz brdo-b9e998170d28363e570d995369b73255f9570ae8.tar.bz2 | |
#205227 by mpare and mfb: Fix logic in file_transfer with ob_end_clean().
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/file.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/file.inc b/includes/file.inc index 1c7c30cf2..ac8549cfd 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -1218,7 +1218,9 @@ function file_set_status($file, $status = FILE_STATUS_PERMANENT) { * An array of HTTP headers to send along with file. */ function file_transfer($source, $headers) { - ob_end_clean(); + if (ob_get_level()) { + ob_end_clean(); + } foreach ($headers as $header) { // To prevent HTTP header injection, we delete new lines that are |