X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;h=77390bc205f7851427ec7c2c3ff049f5c30ffbb9;hb=178bf871182d5e4b5f02378674a0f9504db555c8;hp=df2e5a2f880c99ad0c24b9ad5c87d5ca2ff5c9b6;hpb=e6fa5aeb4f807fb3d5f3b025faced65ede4140dd;p=core.git
diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index df2e5a2f..77390bc2 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -1355,7 +1355,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Is the extra message given?
if (!empty($message)) {
// Then add it as well
- $stubMessage .= sprintf(' Message: %s', $message);
+ $stubMessage .= ' Message: ' . $message;
} // END - if
// Debug instance is there?
@@ -1364,7 +1364,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
$this->debugOutput($stubMessage);
} else {
// Trigger an error
- trigger_error($stubMessage . '
' . chr(10));
+ trigger_error($stubMessage);
}
}
@@ -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);
}
}