Two tickets resolved (57/89)

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 697481ec2e48674f0d6af19a757eb61591047296..a84a8336c4ed6178e05c5cff11ddcf9ecfbea0f6 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -71,14 +71,10 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
        // Output message to user and die
        if (EXT_IS_ACTIVE("debug")) {
                // Debug extension found! So Output a small message
        // Output message to user and die
        if (EXT_IS_ACTIVE("debug")) {
                // Debug extension found! So Output a small message

-               mxchange_die("Error message written to debug.log. Please try to call <a href=\"".URL."\">the main page</a> to continue.");
+               mxchange_die("Error message written to debug.log. Please try to call <a href=\"{!URL!}\">the main page</a> to continue.");

        } else {
        } else {

-               // No debug extension found
-               // @TODO Find a way to rewrite debug_print_backtrace() so we can maybe
-               // @TODO (?) rewrite this to mxchange_die()
-               print("Please report this error at <a href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a>:<pre>");
-               debug_print_backtrace();
-               die("</pre>Thank you for your help finding bugs.");
+               // No debug extension found, so regular output
+               debug_report_bug();

        }
 }
 
        }
 }
 


@@ -97,7 +93,7 @@ function __SHUTDOWN_HOOK () {
                SQL_CLOSE($link, __FILE__, __LINE__);
        } else {
                // No database link
                SQL_CLOSE($link, __FILE__, __LINE__);
        } else {
                // No database link

-               addFatalMessage(NO_DB_LINK);
+               addFatalMessage(getMessage('NO_DB_LINK'));

        }
 }
 
        }
 }