X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=a8d95cf98fd0b49b5a2ed8300c5d47f91f9a1eae;hb=c3b3af29e6e80926519ade146ac657c036782bd3;hp=62885d2e3127aed78c3055c2a7aa7fceede4c583;hpb=094c07fa19309bf3f90b3d39c1c4238e4a5739d6;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 62885d2e31..a8d95cf98f 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -40,11 +40,8 @@ if (!defined('__SECURITY')) {
 // CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
 define('DEBUG_SQL', false);
 
-// Load database library
-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");  
@@ -55,6 +52,9 @@ require_once(PATH."inc/mysql-manager.php");
 // Load extensions and language
 require_once(PATH."inc/extensions.php");
 
+// Load database library
+require_once(PATH."inc/db/lib.php");
+
 // Error handler function
 function __errorHandler ($errno, $errstr, $errfile, $errline) {
 	// Construct message
@@ -167,12 +167,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 				// Run daily reset
 				require_once(PATH."inc/check-reset.php");
 
-				// Create missing configuration file
-				if (!function_exists('GET_CURR_THEME')) {
-					// Load dummy theme functions
-					require_once(PATH."inc/theme-dummy.php");
-				} // END - if
-
 				// Load admin include file if he is admin
 				if (IS_ADMIN()) {
 					// Administrative functions
@@ -263,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