commit 06da78162eb5689311e21c2cc1be2ea88988db57
parent c4cdad1117cc2ea32275eec4fb45aa687726ec88
Author: Jan Dankert <devnull@localhost>
Date: Fri, 7 Dec 2018 23:51:26 +0100
Fix: Der Shutdown-Handler wird nach jedem Script aufgerufen, nur wenn ein Fehler vorliegt, wird etwas geloggt.
Diffstat:
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/modules/cms-core/init.php b/modules/cms-core/init.php
@@ -70,7 +70,9 @@ function exception_error_handler($severity, $message, $file, $line) {
set_error_handler("exception_error_handler");
-
+/**
+ * Ermöglicht das Loggen von Fatal-Errors.
+ */
function fatal_handler() {
$error = error_get_last();
@@ -82,7 +84,7 @@ function fatal_handler() {
$errline = $error["line"];
$errstr = $error["message"];
- $message = $errno .' '. $errstr.' '. $errfile.' '. $errline;
+ $message = 'Error '.$errno .' '. $errstr.' in '. $errfile.':'. $errline;
if(class_exists('Logger'))
Logger::error( $message);
else
@@ -92,11 +94,6 @@ function fatal_handler() {
// It is not possibile to throw an exception out of a shutdown function!
//throw new ErrorException($errstr, $errno, 1, $errfile, $errline);
- }else {
- error_log('Unknown fatal error. Sorry.');
-
- // It is not possibile to throw an exception out of a shutdown function!
- //throw new ErrorException('Fatal error.',E_CORE_ERROR );
}
}
diff --git a/modules/cms-ui/themes/default/html/views/pageelement/info.php b/modules/cms-ui/themes/default/html/views/pageelement/info.php
@@ -27,7 +27,7 @@
</td>
<td class="filename">
- <i class="image-icon image-icon--element-var:element_type"></i>
+ <i class="image-icon image-icon--element-<?php echo $element_type ?>"></i>
<span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'el_'.$element_type.''.'')))); ?></span>