Heacy rewrite/cleanup:

[mailer.git] / inc / load_config.php

diff --git a/inc/load_config.php b/inc/load_config.php
index b7e53a6d8609bff515ec3abef0aa865cd901756f..ee94c6f58243ff1bfd12a142f7fc107cfa0ae0d1 100644 (file)
--- a/inc/load_config.php
+++ b/inc/load_config.php
@@ -82,9 +82,9 @@ if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadab
 }
 
 // Check if the user setups his database login stuff...
-if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestElementSet('installing')) && (isInstalled())) {
+if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstaller()) && (!isGetRequestElementSet('installing')) && (isInstalled())) {
        // No login entered and outside installation mode
-       outputHtml('<strong>{--MAILER_WARNING--}:</strong>');
+       outputHtml('<strong>{--MAILER_WARNING--}</strong>');
        if (isInstalled()) {
                // You have changed my configuration file!
                reportBug(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
@@ -92,9 +92,9 @@ if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallation
                // Please run the installation script (maybe again)
                reportBug(__FILE__, __LINE__, '{--DIE_RUN_INSTALLER_MYSQL--}');
        }
-} elseif ((!isInstalling()) && (!isInstallationPhase()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
+} elseif ((!isInstalling()) && (!isInstaller()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
        // No database password entered
-       displayMessage('<div class="warning">{--MAILER_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
+       displayMessage('<div class="warning">{--MAILER_WARNING--}</div> {--WARN_NULL_PASSWORD--}');
 }
 
 // [EOF]