X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fheader.php;h=06da594e4d73fb13348a091890ab0c79cfa5a232;hb=cd1c86e193ad61cce0998c3092b044258d9a6da9;hp=3ea5b4acfbc8529cb3d6adb484d65981fd8234e3;hpb=a975001c8e332a6af3513ea57e9acebeaadf1640;p=mailer.git diff --git a/inc/header.php b/inc/header.php index 3ea5b4acfb..06da594e4d 100644 --- a/inc/header.php +++ b/inc/header.php @@ -44,11 +44,11 @@ if (!defined('__SECURITY')) { } // Is the header already sent? -if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) { +if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) { // If not in CSS mode generate the header - if (getOutputMode() != '1') { + if (getOutputMode() != 1) { // Config and database connection valid? - if ((isConfigLocalLoaded()) && (isConfigLoaded()) && (SQL_IS_LINK_UP()) && (isExtensionActive('sql_patches'))) { + 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 @@ -123,12 +123,12 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) { } // END - if // Closing HEAD tag - if (getOutputMode() != '1') outputHtml(''); + if (getOutputMode() != 1) outputHtml(''); if ($GLOBALS['header_sent'] == 0) $GLOBALS['header_sent'] = 1; } // END - if // Add BODY tag or not? -if ((getOutputMode() != '1') && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestElementSet('frame')))) { +if ((getOutputMode() != 1) && (getOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestElementSet('frame')))) { loadTemplate('page_body'); $GLOBALS['header_sent'] = 2; } // END - if