Rewritten to fix double-init of session

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 97241d85a771afb4ef0521a6a4d1885dfd34ff7d..aa14de23a4675a910b27e09767ca30a26e26f77b 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -194,9 +194,6 @@ $DEL = array();
 
 // At least one found?
 if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) || ($GLOBALS['cacheMode'] == "no"))) {
-       // Load session management
-       LOAD_INC_ONCE("inc/session.php");
-
        // Extensions are registered so we load them
        while ($content = SQL_FETCHARRAY($res_ext_crt)) {
                // Get menu entry

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index d3418fde37818f0d4680a236cd51a217d5a900f8..84c9a6a1e31a354de1c029e4f4894eadb497d186 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -43,8 +43,8 @@ define('DEBUG_SQL', false);
 // Non-database functions
 require("inc/functions.php");
 
-// Load more function libraries
-foreach (array('request-functions', 'session-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+// 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) {
        // Load special functions
        LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
 } // END - foreach
@@ -115,9 +115,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                // Loading patching system is required here...
                                LOAD_INC_ONCE("inc/patch-system.php"); // Initialize patch system
 
-                               // Session management
-                               LOAD_INC_ONCE("inc/session.php");
-
                                // Run daily reset
                                LOAD_INC_ONCE("inc/check-reset.php");
 
@@ -212,9 +209,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        // Set other missing variables
        if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
 
-       // Include required files
+       // Include databases.php
        LOAD_INC_ONCE("inc/databases.php");
-       LOAD_INC_ONCE("inc/session.php");
 
        // Check if we are in installation routine
        if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {