diff options
| author | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-24 19:30:36 +0200 |
|---|---|---|
| committer | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-24 19:30:36 +0200 |
| commit | b51823dde5fbae508b8ebf99258d2f514a8bece8 (patch) | |
| tree | 4db09a22f85e0ddf151c940cd3e6fbaa799b8513 /system/helpers/download_helper.php | |
| parent | a53f402b78ad07fb0f6da19cff0c7bec3a09a4c0 (diff) | |
| parent | a7001e968a4791312391eb245ad84888893cda8f (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Conflicts:
user_guide_src/source/changelog.rst
Diffstat (limited to 'system/helpers/download_helper.php')
| -rw-r--r-- | system/helpers/download_helper.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php index 09c4de578..0232adfe4 100644 --- a/system/helpers/download_helper.php +++ b/system/helpers/download_helper.php @@ -95,7 +95,10 @@ if ( ! function_exists('force_download')) } // Clean output buffer - ob_clean(); + if (ob_get_level() !== 0) + { + ob_clean(); + } // Generate the server headers header('Content-Type: '.$mime); |