Fixes for POST setter, template and others

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index cd22a87054acce3f2e7d37ab4998be2f7ca7bbe5..3ea5b4acfbc8529cb3d6adb484d65981fd8234e3 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -46,12 +46,12 @@ if (!defined('__SECURITY')) {
 // Is the header already sent?
 if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
        // If not in CSS mode generate the header
-       if ((getOutputMode() != '1')) {
-               // Generate header
-               $TITLE = '';
-
+       if (getOutputMode() != '1') {
                // Config and database connection valid?
                if ((isConfigLocalLoaded()) && (isConfigLoaded()) && (SQL_IS_LINK_UP()) && (isExtensionActive('sql_patches'))) {
+                       // Init title
+                       $TITLE = '';
+
                        // Title decoration enabled?
                        if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_left') != '')) $TITLE .= trim(getConfig('title_left'))." ";
 
@@ -128,7 +128,7 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) {
 } // END - if
 
 // Add BODY tag or not?
-if ((getOutputMode() != '1') && ($GLOBALS['header_sent'] == 1)) {
+if ((getOutputMode() != '1') && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestElementSet('frame')))) {
        loadTemplate('page_body');
        $GLOBALS['header_sent'] = 2;
 } // END - if