Still a bit silly but seems to work

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 0e0bd8068eae71a3828573864a15f2e5fa603b54..7bf73db0fbb7e8cce49af4171a5fa9ac3b7bec12 100644 (file)
--- 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));
@@ -226,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');