More rewrites of constants and fix for loading mass-included scripts by GET_DIR_AS_AR...

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 723933c17985a7ec672ef9d9051dc3d6bdc868dc..226c9918cd4eceb973edfc88402c1a80cfa19b8e 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -76,7 +76,10 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
 
                                // Remember title in constant for the template
                                define('__PAGE_TITLE', $TITLE);
-                       } elseif ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
+                       } elseif ((!isInstalled()) || (!isAdminRegistered())) {
+                               // Load language here
+                               LOAD_INC_ONCE("inc/language.php");
+
                                // Installation mode
                                define('__PAGE_TITLE', getMessage('INSTALLATION_OF_MXCHANGE'));
                        } else {
@@ -100,7 +103,7 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
                        LOAD_TEMPLATE("metadata");
 
                        // Add meta description to header
-                       if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (SQL_IS_LINK_UP())) {
+                       if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
                                // Add meta description not in admin and login module and when the script is installed
                                META_DESCRIPTION($GLOBALS['module'], $GLOBALS['what']);
                        } // END - if