From: Roland Häder <roland@mxchange.org>
Date: Sun, 20 Jun 2010 18:23:15 +0000 (+0000)
Subject: Fix attempt for empty database password
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4707e8e1d5511597b3d425bca0fd5addbb6fe2a8;p=mailer.git

Fix attempt for empty database password
---

diff --git a/inc/functions.php b/inc/functions.php
index 1d7c71f5d2..a1577f58a7 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3863,9 +3863,6 @@ function isSpider () {
 
 // Prepares the header for HTML output
 function loadHtmlHeader () {
-	// Enable HTML templates
-	enableTemplateHtml();
-
 	// Run two filters:
 	// 1.) pre_page_header (mainly loads the page_header template and includes
 	//     meta description)
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 4ad7d8b267..c01636fe48 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -72,6 +72,9 @@ initFatalMessages();
 // Init message system
 initMessages();
 
+// Enable HTML templates by default
+enableTemplateHtml();
+
 // Are we in installation phase?
 if ((!isInstalling()) && (!isInstallationPhase())) {
 	// Load configuration file(s) here
@@ -83,7 +86,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 	// CSS array
 	initExtensionCssFiles();
 
-	if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['password'])) && (!empty($GLOBALS['mysql']['dbase']))) {
+	if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['dbase']))) {
 		// Connect to DB
 		SQL_CONNECT($GLOBALS['mysql']['host'], $GLOBALS['mysql']['login'], $GLOBALS['mysql']['password'], __FILE__, __LINE__);