X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fhandler.php;h=40aecad99ec22f4cd0efb8bef00674591b11f771;hb=6ab597cf6eeb82241f57ca7d13871338dbb9bcaa;hp=fe9149c99e20232393e4de3ed929e24c2e5761ec;hpb=0cc73bd7020ca53d7e296b9f5842331fb0d54cb1;p=mailer.git

diff --git a/inc/handler.php b/inc/handler.php
index fe9149c99e..40aecad99e 100644
--- a/inc/handler.php
+++ b/inc/handler.php
@@ -43,24 +43,22 @@ if (!defined('__SECURITY')) {
 // Error handler function
 function __errorHandler ($errno, $errstr, $errfile, $errline) {
 	// Construct message
-	$message = sprintf("errno=%s,errstr=%s,errfile=%s,errline=%s",
+	$message = sprintf("errno=%s(0x%s),errstr=%s,errfile=%s,errline=%s",
 		$errno,
+		getHexErrorCode($errno),
 		$errstr,
 		basename($errfile),
 		$errline
 	);
 
-	// Is installation phase?
-	if (isInstallationPhase()) {
+	// Is HTML output mode?
+	if (isHtmlOutputMode()) {
+		// Output message to user and exit
+		reportBug($errfile, $errline, $message);
+	} else {
 		// Log error message
 		logDebugMessage($errfile, $errline, $message);
-	} else {
-		// Output message to user and die
-		reportBug($errfile, $errline, $message);
 	}
-
-	// Always return false
-	return FALSE;
 }
 
 // Init error handler