Missing theme extension fixed in theme_edit/theme_import

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 65ef9187faee9137559fe933fef3865086c85f6f..7bbaee5e1ea1b72aef8816547f227a8d55ab3b0b 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -55,20 +55,30 @@ require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the
 
 // Load extensions and language
 require_once(PATH."inc/extensions.php");
-require_once(PATH."inc/language.php");
 
-// Init error handler
+// Error handler function
 function __errorHandler ($errno, $errstr, $errfile, $errline) {
+       // Construct message
        $msg = sprintf("errno=%s,errstr=%s,errfile=%s,errline=%s",
                $errno,
                $errstr,
                basename($errfile),
                $errline
        );
+
+       // Write debug log message
        DEBUG_LOG(__FUNCTION__.":".$msg, true);
-       print "Please report this error at <a href=\"http://forum.mxchange.org\" target=\"_blank\">forum.mxchange.org</a>:<pre>";
-       debug_print_backtrace();
-       die("</pre>Thanks for your help finding bugs.");
+
+       // Output message to user and die
+       if (EXT_IS_ACTIVE("debug")) {
+               // Debug extension found! :-)
+               die("Error message written to debug.log. Please try to call <a href=\"".URL."\">the main page</a> to continue.");
+       } else {
+               // No debug extension found
+               print("Please report this error at <a href=\"http://forum.mxchange.org\" target=\"_blank\">forum.mxchange.org</a>:<pre>");
+               debug_print_backtrace();
+               die("</pre>Thanks for your help finding bugs.");
+       }
 }
 
 // Set error handler
@@ -112,6 +122,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                        // Is it a valid resource?
                        if ($db === true) {
                                // Remove MySQL array from namespace
+                               define('__DB_NAME', $MySQL['dbase']);
                                unset($MySQL);
 
                                // Load configuration stuff
@@ -198,15 +209,24 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                        define('RAND_NUMBER', mt_rand(1000000, 9999999));
                                }
                        } else {
+                               // Add language system
+                               include (PATH."inc/language.php");
+
                                // Wrong database?
                                ADD_FATAL(WRONG_DB_SELECTED);
                        }
                } else {
+                       // Add language system
+                       include (PATH."inc/language.php");
+
                        // No link to database!
                        ADD_FATAL(NO_DB_LINK);
                        $db = false;
                }
        } else {
+               // Add language system
+               include (PATH."inc/language.php");
+
                // Maybe you forgot to enter your MySQL data?
                ADD_FATAL(MYSQL_DATA_MISSING);
        }