Swapped all

[mailer.git] / inc / handler.php

diff --git a/inc/handler.php b/inc/handler.php
index fe9149c99e20232393e4de3ed929e24c2e5761ec..40aecad99ec22f4cd0efb8bef00674591b11f771 100644 (file)
--- 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