diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-05-23 10:20:59 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-05-23 10:20:59 +0200 |
| commit | 93a8c54bcb9d3590493da52457ef249aa37ce42d (patch) | |
| tree | 212a188fc0da7c79f7cbfa1b4ab72a63e1e17f9d /phpBB/includes/functions.php | |
| parent | fe3f3bc83962bf902f79654ad5fe7d40a49e4325 (diff) | |
| parent | e4681f0929eb9633289e4517d8185418b7a9d07b (diff) | |
| download | forums-93a8c54bcb9d3590493da52457ef249aa37ce42d.tar forums-93a8c54bcb9d3590493da52457ef249aa37ce42d.tar.gz forums-93a8c54bcb9d3590493da52457ef249aa37ce42d.tar.bz2 forums-93a8c54bcb9d3590493da52457ef249aa37ce42d.tar.xz forums-93a8c54bcb9d3590493da52457ef249aa37ce42d.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10191] Use ob_get_level in exit_handler for output buffering check.
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index edbfc09ffd..4b9c643a47 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4631,7 +4631,7 @@ function exit_handler() } // As a pre-caution... some setups display a blank page if the flush() is not there. - (empty($config['gzip_compress'])) ? @flush() : @ob_flush(); + (ob_get_level() > 0) ? @ob_flush() : @flush(); exit; } |