aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-05-23 10:18:49 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-05-23 10:18:49 +0200
commite4681f0929eb9633289e4517d8185418b7a9d07b (patch)
tree9112f835ec9434f2145c92571367b1dc806c4f4a
parent00a4ace57327483c1cf06acc8891aa42b205ccc7 (diff)
parent44cc8153cdfedda1d0733655bc13e5e9beac3431 (diff)
downloadforums-e4681f0929eb9633289e4517d8185418b7a9d07b.tar
forums-e4681f0929eb9633289e4517d8185418b7a9d07b.tar.gz
forums-e4681f0929eb9633289e4517d8185418b7a9d07b.tar.bz2
forums-e4681f0929eb9633289e4517d8185418b7a9d07b.tar.xz
forums-e4681f0929eb9633289e4517d8185418b7a9d07b.zip
Merge remote-tracking branch 'p/ticket/10191' into develop-olympus
* p/ticket/10191: [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9f1d39118a..791aa09010 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4719,7 +4719,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;
}