Several rewrites/fixes which I have done yesterday but not commited, mxchange_die...

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index d8d70d7c8abf1dd1827d1867a18e1aa4e967275f..326edc5cebe82223b7de24dd11af802d0b5a9d6c 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 require("inc/functions.php");
 
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
        // Load special functions
        LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
 } // END - foreach
@@ -60,10 +60,10 @@ if ((empty($MySQL['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('instal
        OUTPUT_HTML("<strong>{--LANG_WARNING--}:</strong> ");
        if (isInstalled()) {
                // You have changed my configuration file!
-               mxchange_die("{--DIE_CONFIG_CHANGED_YOU--}");
+               app_die(__FILE__, __LINE__, "{--DIE_CONFIG_CHANGED_YOU--}");
        } else {
                // Please run the installation script (maybe again)
-               mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
+               app_die(__FILE__, __LINE__, "{--DIE_RUN_INSTALL_MYSQL--}");
        }
 } elseif ((!isInstalling()) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
        // No database password entered!!!