Deprecated 'replacer' removed. Now we use EL code instead (there are a lot example...

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index dd7998d02438c1b4a83eb1b6907a347785551299..750bfb333cc3ea456eddc45c5dd402daebd9b865 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -67,9 +67,6 @@ if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = '0';
 // Init fatal messages
 initFatalMessages();
 
-// Init message system
-initMessages();
-
 // Init repository data sub-system
 initRepositoryData();
 
@@ -84,6 +81,9 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        // Load database layer here
        loadIncludeOnce('inc/db/lib.php');
 
+       // Init message system
+       initMessages();
+
        // CSS array
        initExtensionCssFiles();
 
@@ -129,7 +129,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                        addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
                }
        } else {
-               // Maybe you forgot to enter your MySQL data?
+               // Maybe you forgot to enter your database login?
                addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
        }
 } else {
@@ -145,8 +145,14 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        // CFG: DATABASE-TYPE
        setConfigEntry('_DB_TYPE', 'mysql3');
 
+       // Load database layer here
+       loadIncludeOnce('inc/db/lib.php');
+
+       // Init message system
+       initMessages();
+
        // Include more
-       foreach (array('db/lib','databases','session','versions','install-functions','load_config','load_cache') as $inc) {
+       foreach (array('databases','session','versions','install-functions','load_config','load_cache') as $inc) {
                // Load the include
                loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach