debug_report_bug() does call app_die() again (internal TODO), nicer template for...

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 95d143c2a33e1dcde41e965dd93ac032694a99c5..8928e602fa428c51ab064641ff281a61e17d5e90 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2208,10 +2208,10 @@ function app_die ($F, $L, $message) {
                $message = sprintf(getMessage('MXCHANGE_HAS_DIED'), basename($F), $L, $message);
 
                // Better log this message away
-               logDebugMessage($F, $L, $message);
+               if ($F != 'debug_report_bug') logDebugMessage($F, $L, $message);
 
                // Load the message template
-               loadTemplate('admin_settings_saved', false, $message);
+               loadTemplate('app_die_message', false, $message);
 
                // Load footer
                loadIncludeOnce('inc/footer.php');
@@ -2587,8 +2587,7 @@ function debug_report_bug ($message = '', $sendEmail = true) {
        } // END - if
 
        // And abort here
-       // @TODO This cannot be rewritten to app_die(), try to find a solution for this.
-       die($debug);
+       app_die(__FUNCTION__, __LINE__, $debug);
 }
 
 // Generates a ***weak*** seed