Refback and referal points hopefully fixed:

[mailer.git] / inc / template-functions.php

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 25e899ee11d3d8ec3ad2063ed8183d6ebb1bf3a4..6e2e4730660d0f0e803575ab0fc29e97f4435cb1 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -240,8 +240,11 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
                // Use it again
                $code = $newContent;
 
-               // Compile the final code
-               $code = compileRawCode($code);
+               // Compile the final code if insertComments is true
+               if ($insertComments == true) {
+                       // ... because SQL queries shall keep OPEN_CONFIG and such in
+                       $code = compileRawCode($code);
+               } // END - if
 
                // Count round
                $count++;
@@ -434,7 +437,7 @@ function detectExtraTemplatePath ($template) {
 }
 
 // Loads an email template and compiles it
-function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadUserData = true) {
+function loadEmailTemplate ($template, $content = array(), $userid = NULL, $loadUserData = true) {
        // @TODO $DATA is deprecated and should be avoided and replaced with $content
        global $DATA;