Even more fixes, loading session was on wrong page (needs db link up)

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index ee7ec8ebfd02599335e797ac30fe1244ecad912f..0b60390d9227f7b19fce04dbb1ac7f3a1d4184b2 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -44,7 +44,7 @@ define('DEBUG_SQL', false);
 require("inc/functions.php");
 
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks', 'session') as $lib) {
+foreach (array('request-functions', 'session-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
        // Load special functions
        LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
 } // END - foreach
@@ -106,6 +106,9 @@ if ((!isInstalling()) && (isInstalled())) {
                                // Load configuration stuff
                                loadConfiguration();
 
+                               // Init session
+                               LOAD_INC_ONCE("inc/session.php");
+
                                // Load "databases" aka static arrays
                                LOAD_INC_ONCE("inc/databases.php");
 
@@ -197,6 +200,9 @@ if ((!isInstalling()) && (isInstalled())) {
        // Set other missing variables
        if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
 
+       // Init session
+       LOAD_INC_ONCE("inc/session.php");
+
        // Include databases.php
        LOAD_INC_ONCE("inc/databases.php");