Rewrites not to init config in config-functions.php (some still remain, many untested)

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index d29d479a65eca35f0e4805e32c009356c8f1c965..42b6a887dc41966c7e792983c6961eedb17841f0 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -69,10 +69,7 @@ initFatalMessages();
 initMessages();
 
 // Check if this file is writeable or read-only and warn the user
-if ((!isInstalling()) && (!isInstallationPhase())) {
-       // Load "databases" aka static arrays
-       loadIncludeOnce('inc/databases.php');
-
+if (!isInstalling()) {
        // Load database layer here
        loadIncludeOnce('inc/db/lib.php');
 
@@ -112,6 +109,9 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                                // Run the init filter chain
                                runFilterChain('init');
 
+                               // Load "databases" aka static arrays
+                               loadIncludeOnce('inc/databases.php');
+
                                // Check module for permissions
                                $checkModule = checkModulePermissions();
 
@@ -155,7 +155,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        if (!isOutputModeSet()) setOutputMode(0);
 
        // Include more
-       foreach (array('inc/databases.php','inc/db/lib.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+       foreach (array('inc/databases.php','inc/versions.php','inc/db/lib.php','inc/session.php','inc/install-functions.php','inc/load_config.php') as $inc) {
                // Load the include
                loadIncludeOnce($inc);
        } // END - foreach