Fix attempt for empty database password

diff --git a/inc/functions.php b/inc/functions.php
index 1d7c71f5d230274e05c92a05351c2c551fb2fa97..a1577f58a7e5b6caedd1817a0c10ae43e4f6cf49 100644 (file)
--- 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 4ad7d8b2670a5f9d6991ee750ccf94f816089ba4..c01636fe48014119fafa6d4667bbc8c93a94215b 100644 (file)
--- 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__);