Fixes for installation phase

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 741122f5a8e450b1f1d3d45008fe23de463c72cd..2a325ccc921c0bd795cb16f1ac33147e1be2a64b 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -103,7 +103,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                                // Remove MySQL array from namespace
                                unset($GLOBALS['mysql']);
 
                                // Remove MySQL array from namespace
                                unset($GLOBALS['mysql']);
 

-                               // Administrative functions
+                               // Load cache

                                loadIncludeOnce('inc/load_cache.php');
 
                                // Init filter system
                                loadIncludeOnce('inc/load_cache.php');
 
                                // Init filter system


@@ -172,8 +172,8 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                loadIncludeOnce($inc);
        } // END - foreach
 
                loadIncludeOnce($inc);
        } // END - foreach
 

-       // Init filter system here
-       initFilterSystem();
+       // Load config
+       loadIncludeOnce('inc/load_config.php');

 
        // Are we installation routine?
        if ((!isInstalling()) && (getOutputMode() != '1') && (getOutputMode() != -1)) {
 
        // Are we installation routine?
        if ((!isInstalling()) && (getOutputMode() != '1') && (getOutputMode() != -1)) {


@@ -181,14 +181,14 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                redirectToUrl('install.php');
        } // END - if
 
                redirectToUrl('install.php');
        } // END - if
 

-       // Administrative functions
+       // Init filter system here
+       initFilterSystem();
+
+       // Load cache

        loadIncludeOnce('inc/load_cache.php');
 
        // Run the init filter chain
        runFilterChain('init');
        loadIncludeOnce('inc/load_cache.php');
 
        // Run the init filter chain
        runFilterChain('init');

-
-       // Load configuration file(s) here
-       loadIncludeOnce('inc/load_config.php');

 }
 
 // Handle fatal errors
 }
 
 // Handle fatal errors