X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=7bf73db0fbb7e8cce49af4171a5fa9ac3b7bec12;hp=0fe09b27dcc09db9466e64e8a8094d51403189a1;hb=78de893e6a62885f106b8176aece16847c09eea2;hpb=5071030af40e69ca4284642f44758964e18f5be8

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 0fe09b27dc..7bf73db0fb 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -68,12 +68,6 @@ if ((!isInstalling()) && (isInstalled())) {
 	// Load "databases" aka static arrays
 	loadIncludeOnce('inc/databases.php');
 
-	// Init session
-	loadIncludeOnce('inc/session.php');
-
-	// Load versions
-	loadIncludeOnce('inc/versions.php');
-
 	// Load configuration file(s) here
 	loadIncludeOnce('inc/load_config.php');
 
@@ -101,6 +95,12 @@ if ((!isInstalling()) && (isInstalled())) {
 				// Load configuration stuff
 				loadConfiguration();
 
+				// Init session
+				loadIncludeOnce('inc/session.php');
+
+				// Load versions
+				loadIncludeOnce('inc/versions.php');
+
 				// Loading patching system is required here...
 				loadIncludeOnce('inc/patch-system.php');
 
@@ -158,7 +158,7 @@ if ((!isInstalling()) && (isInstalled())) {
 				// Is the extension sql_patches installed and at least 0.3.6?
 				if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
 					// Generate random number
-					define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), getUserId(), ''));
+					define('RAND_NUMBER', generateRandomCode(10, mt_rand(10000,32766), getUserId(), ''));
 				} else {
 					// Generate weak (!!!) code
 					define('RAND_NUMBER', mt_rand(1000000, 9999999));
@@ -180,6 +180,9 @@ if ((!isInstalling()) && (isInstalled())) {
 	// Include neccessary functions for installation //
 	///////////////////////////////////////////////////
 
+	// Default output is 'direct' for HTML output
+	setConfigEntry('OUTPUT_MODE', 'direct');
+
 	// This hack prevents a backtrace in CSS output
 	if ($GLOBALS['output_mode'] == '1') {
 		// Problem with config so set output mode
@@ -223,8 +226,17 @@ if ((!isInstalling()) && (isInstalled())) {
 
 	// Load extension 'sql_patches'
 	LOAD_EXTENSION('sql_patches');
+
+	// Load configuration file(s) here
+	loadIncludeOnce('inc/load_config.php');
 }
 
+// Init session
+loadIncludeOnce('inc/session.php');
+
+// Load versions
+loadIncludeOnce('inc/versions.php');
+
 if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($GLOBALS['output_mode'] != '1')) {
 	// One or more fatal error(s) occur during connect...
 	loadIncludeOnce('inc/header.php');