diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 15:10:59 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 15:10:59 +0000 |
| commit | 91d0c8b3bf41dfed42d8e33595c0e530a431db1c (patch) | |
| tree | 025fdf94609a4875d691f3580c5bee7ef407f9bc /phpBB/includes/functions.php | |
| parent | f2ba40f294d8e9e75a3adb78eedb2dc47633043e (diff) | |
| download | forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.gz forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.bz2 forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.xz forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.zip | |
merge again, revisions 8516 to 8525
git-svn-id: file:///svn/phpbb/trunk@8526 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index cbedd9804a..a42d773286 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2865,6 +2865,12 @@ function msg_handler($errno, $msg_text, $errfile, $errline) if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false) { // flush the content, else we get a white page if output buffering is on + if (strtolower(@ini_get('output_buffering')) !== 'off') + { + @ob_end_flush(); + } + + // Another quick fix for those having gzip compression enabled if ($config['gzip_compress']) { if (@extension_loaded('zlib') && !headers_sent()) @@ -3488,7 +3494,7 @@ function garbage_collection() */ function exit_handler() { - global $phpbb_hook; + global $phpbb_hook, $config; if (!empty($phpbb_hook) && $phpbb_hook->call_hook(__FUNCTION__)) { @@ -3499,7 +3505,7 @@ function exit_handler() } // As a pre-caution... some setups display a blank page if the flush() is not there. - @flush(); + (!$config['gzip_compress']) ? @flush() : @ob_flush(); exit; } |