Fix for non-working admin login if no extension is installed (an other fixed broke it)

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 3d00c3ca4643ee255b9ae45674e5d8a745c6d136..f9f1457e4d078eefb271a0140d232a654c654a18 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -44,7 +44,7 @@ define('DEBUG_SQL', false);
 require_once(PATH."inc/db/lib.php");
 
 // Non-database functions
-require_once(PATH."inc/functions.php");  
+require_once(PATH."inc/functions.php");
 
 // Filter functions
 require_once(PATH."inc/filters.php");  
@@ -155,27 +155,15 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                // Load configuration stuff
                                $_CONFIG = merge_array($_CONFIG, LOAD_CONFIG());
 
-                               // Initialize include-file-pool
-                               $INC_POOL = array();
-
                                // Load "databases" aka static arrays
                                require_once(PATH."inc/databases.php");
 
                                // Loading patching system is required here...
                                require_once(PATH."inc/patch-system.php"); // Initialize patch system
 
-                               // Create missing configuration file
-                               if (!function_exists('GET_CURR_THEME')) {
-                                       // Load dummy theme functions
-                                       require_once(PATH."inc/theme-dummy.php");
-                               } // END - if
-
                                // Session management
                                require_once(PATH."inc/session.php");
 
-                               // Init filter system
-                               INIT_FILTER_SYSTEM();
-
                                // Run daily reset
                                require_once(PATH."inc/check-reset.php");
 
@@ -269,21 +257,15 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        ///////////////////////////////////////////////////
 
        // Set other missing variables
+       if (!isset($CSS)) $CSS = "0";
        $link = false; // No database link by default
 
        // Include required files
        require_once(PATH."inc/databases.php");
        require_once(PATH."inc/session.php");
 
-       // Create missing configuration file
-       if (!function_exists('GET_CURR_THEME')) {
-               // Load dummy theme functions
-               require_once(PATH."inc/theme-dummy.php");
-       } // END - if
-
        // Check if we are in installation routine
-       $installPhp = basename($_SERVER['PHP_SELF']);
-       if (($installPhp != "install.php") && ($CSS != "1") && ($CSS != -1)) {
+       if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($CSS != "1") && ($CSS != -1)) {
                // Redirect to the installation system
                LOAD_URL("install.php");
        } // END - if