X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=f4e1d42d3a81aaec36f3cb735d57b32964f77b14;hp=8693a51c6b33fac51b5028e2b12f7dc643401cc0;hb=0437f06b273f885db05736449a952c6eb72086ca;hpb=116f17077ae6fa32c7373ccd6aaf94044bb6c276

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 8693a51c6b..f4e1d42d3a 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -57,33 +57,17 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'co
 // Set error handler
 set_error_handler('__errorHandler');
 
-// Load configuration file(s) here
-loadIncludeOnce('inc/load_config.php');
-
 // Set important header_sent
 $GLOBALS['header_sent'] = 0;
 
-// Check if the user setups his MySQL stuff...
-if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('installing')) && (isInstalled())) {
-	// No login entered and outside installation mode
-	OUTPUT_HTML('<strong>{--LANG_WARNING--}:</strong> ');
-	if (isInstalled()) {
-		// You have changed my configuration file!
-		app_die(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
-	} else {
-		// Please run the installation script (maybe again)
-		app_die(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}');
-	}
-} elseif ((!isInstalling()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
-	// No database password entered!!!
-	OUTPUT_HTML('<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
-}
-
 // Init fatal messages
 initFatalMessages();
 
 // Check if this file is writeable or read-only and warn the user
 if ((!isInstalling()) && (isInstalled())) {
+	// Load configuration file(s) here
+	loadIncludeOnce('inc/load_config.php');
+
 	// Check for write-permission for config.php and inc directory
 	if (empty($GLOBALS['module'])) $GLOBALS['module'] = REQUEST_GET('module');
 	if (empty($GLOBALS['module'])) $GLOBALS['module'] = 'index';