Further fixes for wrong getMaskedMessage() usage in 'compiled' code

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 1d7c71f5d230274e05c92a05351c2c551fb2fa97..5e7d2962d2adabc3e0a022d89c4b4fe8ff30dfc3 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -171,7 +171,7 @@ function compileFinalOutput () {
 
 // Main compilation loop
 function doFinalCompilation ($code, $insertComments = true) {
-       // Insert comments?
+       // Insert comments? (Only valid with HTML templates, of course)
        enableTemplateHtml($insertComments);
 
        // Init counter
@@ -186,7 +186,7 @@ function doFinalCompilation ($code, $insertComments = true) {
                // Compile it
                //* DEBUG: */ print '<pre>'.htmlentities($code).'</pre>';
                $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code))) . '";';
-               //* DEBUG: */ die('<pre>'.htmlentities($eval).'</pre>');
+               //* DEBUG: */ if ($insertComments) die('<pre>'.linenumberCode($eval).'</pre>');
                eval($eval);
                //* DEBUG: */ die('<pre>'.htmlentities($newContent).'</pre>');
 
@@ -987,6 +987,9 @@ function redirectToUrl ($URL, $allowSpider = true) {
 
        // Simple probe for bots/spiders from search engines
        if ((isSpider()) && ($allowSpider === true)) {
+               // Set HTTP-Status
+               setHttpStatus('200 OK');
+
                // Set content-type here to fix a missing array element
                setContentType('text/html');
 
@@ -3863,9 +3866,6 @@ function isSpider () {
 
 // Prepares the header for HTML output
 function loadHtmlHeader () {
-       // Enable HTML templates
-       enableTemplateHtml();
-
        // Run two filters:
        // 1.) pre_page_header (mainly loads the page_header template and includes
        //     meta description)