New wrapper functions introduced

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 785ddd8ebb049233262cb328527a84e7bbe1f4ec..2f5f4a1527d4f337041dd42ab66fd1b707f1da39 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -53,7 +53,7 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
        setHttpStatus('200 OK');
 
        // If not in CSS mode generate the header
-       if (getScriptOutputMode() != 1) {
+       if (!isCssOutputMode()) {
                // Prepare the header for HTML output
                loadHtmlHeader();
        } // END - if
@@ -63,7 +63,7 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
 } // END - if
 
 // Add BODY tag or not?
-if ((getScriptOutputMode() != 1) && (getScriptOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestParameterSet('frame')))) {
+if ((!isCssOutputMode()) && (!isRawOutputMode()) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestParameterSet('frame')))) {
        loadTemplate('page_body');
        $GLOBALS['header_sent'] = 2;
 } // END - if