diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-05 14:11:42 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-05 14:11:42 +0000 |
| commit | 8822747b91883b0b9ddf322ce052ccb11f4429d5 (patch) | |
| tree | 50a33184cf10fc0b8ae241bf68c8658ca675844f /phpBB/includes/functions.php | |
| parent | ea3eb9e9c3c2144fbb50cc2d78412fe8a854058f (diff) | |
| download | forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.tar forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.tar.gz forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.tar.bz2 forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.tar.xz forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.zip | |
merge...
git-svn-id: file:///svn/phpbb/trunk@8610 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ed784405ac..6b5efd3559 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2915,15 +2915,15 @@ 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') + if ((int) @ini_get('output_buffering') === 1 || strtolower(@ini_get('output_buffering')) === 'on') { - @ob_end_flush(); + @ob_flush(); } - // Another quick fix for those having gzip compression enabled + // Another quick fix for those having gzip compression enabled, but do not flush if the coder wants to catch "something". ;) if ($config['gzip_compress']) { - if (@extension_loaded('zlib') && !headers_sent()) + if (@extension_loaded('zlib') && !headers_sent() && !ob_get_level()) { @ob_flush(); } |