Several kinky code smoothed, fixes for admin login

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 34feadb23c9e766ac0ce013d410a40996a8de436..06da594e4d73fb13348a091890ab0c79cfa5a232 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -48,7 +48,7 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
        // If not in CSS mode generate the header
        if (getOutputMode() != 1) {
                // Config and database connection valid?
-               if ((isConfigLocalLoaded()) && (isConfigLoaded()) && (SQL_IS_LINK_UP()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.6'))) {
+               if ((isConfigLocalLoaded()) && (isConfigurationLoaded()) && (SQL_IS_LINK_UP()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.6'))) {
                        // Init title
                        $TITLE = '';
 
@@ -94,7 +94,7 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
                        $content['header_title'] = getMessage('NO_CONFIG_FOUND_TITLE');
 
                        // Do not add the fatal message in installation mode
-                       if ((!isInstalling()) && (!isConfigLoaded())) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND'));
+                       if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND'));
                }
 
                // Save some little memory