From 91d0c8b3bf41dfed42d8e33595c0e530a431db1c Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 21 Apr 2008 15:10:59 +0000
Subject: merge again, revisions 8516 to 8525

git-svn-id: file:///svn/phpbb/trunk@8526 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/functions.php')

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;
 }
-- 
cgit v1.2.1