Fix for comment #0000444

diff --git a/inc/functions.php b/inc/functions.php
index 6e3cda3de9dad272524e41e5964431122e6f1cbe..9a6014a05b515e9197cc8299bf1b50e8c4e45c5f 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2362,10 +2362,13 @@ function app_die ($F, $L, $message) {
                loadIncludeOnce('inc/header.php');
 
                // Rewrite message for output
-               $message = sprintf(getMessage('MXCHANGE_HAS_DIED'), basename($F), $L, $message);
+               $message = sprintf(getMessage('MAILER_HAS_DIED'), basename($F), $L, $message);
 
-               // Better log this message away
-               if ($F != 'debug_report_bug') logDebugMessage($F, $L, $message);
+               // We don't want to log messages from debug_report_bug() itself...
+               if ($F != 'debug_report_bug') {
+                       // Better log this message away
+                       logDebugMessage($F, $L, $message);
+               } // END - if
 
                // Load the message template
                loadTemplate('app_die_message', false, $message);
@@ -2379,7 +2382,7 @@ function app_die ($F, $L, $message) {
 }
 
 // Display parsing time and number of SQL queries in footer
-function displayParsingTime() {
+function displayParsingTime () {
        // Is the timer started?
        if (!isset($GLOBALS['startTime'])) {
                // Abort here