A lot code refactured to newly introduces wrapper function isNicknameUsed()

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 20d19f4b365de63b4a3f94801aa4fa46b7cfa14d..446518563af4851587ea218b24a246efe7a9b225 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -57,6 +57,9 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'co
 // Set error handler
 set_error_handler('__errorHandler');
 
+// Init request
+initRequest();
+
 // Set important header_sent
 $GLOBALS['header_sent'] = 0;
 
@@ -68,12 +71,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 +98,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');
 
@@ -231,6 +234,12 @@ if ((!isInstalling()) && (isInstalled())) {
        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');