X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=aa7df75574a5dc4d8808687d9c10f676b7e8a10e;hb=7db7d1ad72783bf7650fbb39a0a00a447b0c147a;hp=42b6a887dc41966c7e792983c6961eedb17841f0;hpb=a2ca374f65976d21651fffb64a78d3a9678bb3b8;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 42b6a887dc..aa7df75574 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -59,8 +59,11 @@ initErrorHandler();
 // Init request
 initRequest();
 
+// Init userid
+initMemberId();
+
 // Set important header_sent
-if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0;
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = '0';
 
 // Init fatal messages
 initFatalMessages();
@@ -70,16 +73,12 @@ initMessages();
 
 // Check if this file is writeable or read-only and warn the user
 if (!isInstalling()) {
-	// Load database layer here
-	loadIncludeOnce('inc/db/lib.php');
-
-	// Set missing module
-	if ((!isModuleSet()) && (isGetRequestElementSet('module'))) setModule(getRequestElement('module'));
-	if (!isModuleSet()) setModule('index');
-
 	// Load configuration file(s) here
 	loadIncludeOnce('inc/load_config.php');
 
+	// Load database layer here
+	loadIncludeOnce('inc/db/lib.php');
+
 	// CSS array
 	initExtensionCssFiles();
 
@@ -109,9 +108,6 @@ if (!isInstalling()) {
 				// Run the init filter chain
 				runFilterChain('init');
 
-				// Load "databases" aka static arrays
-				loadIncludeOnce('inc/databases.php');
-
 				// Check module for permissions
 				$checkModule = checkModulePermissions();
 
@@ -151,9 +147,6 @@ if (!isInstalling()) {
 		setConfigEntry('OUTPUT_MODE', 'render');
 	} // END - if
 
-	// Set other missing variables
-	if (!isOutputModeSet()) setOutputMode(0);
-
 	// Include more
 	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