From b19fa2fcefa1046b2bcb8133ab6c897d12d01815 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 30 May 2012 20:43:54 +0000
Subject: [PATCH] Some rewrites

---
 .../main/class_BaseFrameworkSystem.php        | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 63ba260e..77390bc2 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -1393,7 +1393,9 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Outputs a debug message whether to debug instance (should be set!) or dies with or pints the message
+	 * Outputs a debug message whether to debug instance (should be set!) or
+	 * dies with or ptints the message. Do NEVER EVER rewrite the die() call to
+	 * ApplicationEntryPoint::app_die(), this would cause an endless loop.
 	 *
 	 * @param	$message	Message we shall send out...
 	 * @param	$doPrint	Whether print or die here (default: print)
@@ -1415,28 +1417,25 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		// Is the debug instance there?
 		if (is_object($debugInstance)) {
 			// Use debug output handler
-			$debugInstance->output($message);
+			$debugInstance->output($message, $stripTags);
 
 			if ($doPrint === false) {
 				// Die here if not printed
 				die();
 			} // END - if
 		} else {
+			// Are debug times enabled?
+			if ($this->getConfigInstance()->getConfigEntry('debug_output_timings') == 'Y') {
+				// Prepent it
+				$message = $this->getPrintableExecutionTime() . $message;
+			} // END - if
+
 			// Put directly out
 			if ($doPrint === true) {
-				// Are debug times enabled?
-				if ($this->getConfigInstance()->getConfigEntry('debug_output_timings') == 'Y') {
-					// Output it first
-					print($this->getPrintableExecutionTime());
-				} // END - if
-
 				// Print message
 				print($message . chr(10));
 			} else {
-				/*
-				 * BIG FAT NOTE: Do NEVER rewrite this to app_die(), this will
-				 * cause an endless loop.
-				 */
+				// Die here
 				die($message);
 			}
 		}
-- 
2.30.2