From: Roland Häder <roland@mxchange.org>
Date: Sun, 1 Mar 2009 00:05:28 +0000 (+0000)
Subject: Rewritten to fix double-init of session
X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=a7b0c182c660809dc95c8dd1205809006ae2f9c7

Rewritten to fix double-init of session
---

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 97241d85a7..aa14de23a4 100644
--- 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 d3418fde37..84c9a6a1e3 100644
--- 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)) {