From 9c233ac3be8ef85040fc580689bf2436c81522ec Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 22 Nov 2009 20:00:33 +0000
Subject: [PATCH] More fixes for redirect vs. regular output, thanks to
 wernisman

---
 inc/functions.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/inc/functions.php b/inc/functions.php
index d6a9cb65eb..95d143c2a3 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -85,7 +85,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 				app_die(__FUNCTION__, __LINE__, '<strong>{--FATAL_ERROR--}:</strong> {--LANG_NO_RENDER_DIRECT--}');
 				break;
 		} // END - switch
-	} elseif (getPhpCaching() == 'on') {
+	} elseif ((getPhpCaching() == 'on') && ((!isset($GLOBALS['header'])) || (count($GLOBALS['header']) == 0))) {
 		// Output cached HTML code
 		$GLOBALS['output'] = ob_get_contents();
 
@@ -121,6 +121,9 @@ function outputHtml ($htmlCode, $newLine = true) {
 
 		// Output code here, DO NOT REMOVE! ;-)
 		outputRawCode($GLOBALS['output']);
+	} else {
+		// And flush all headers
+		flushHeaders();
 	}
 }
 
-- 
2.39.5