Renamed function so it might be more understandable

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

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 0c364ef457151a047c4b87d5dbedb00f3ad9c8b7..b675c6b6dc522617cd22de76010508efe72eed31 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -213,10 +213,10 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
        enableTemplateHtml($insertComments);
 
        // Init counter
-       $cnt = 0;
+       $count = 0;
 
        // Compile all out
-       while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($cnt < 5)) {
+       while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($count < 5)) {
                // Init common variables
                $content = array();
                $newContent = '';
@@ -239,7 +239,7 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
                $code = $newContent;
 
                // Count round
-               $cnt++;
+               $count++;
        } // END - while
 
        // Return the compiled code
@@ -415,7 +415,7 @@ function detectExtraTemplatePath ($template) {
 }
 
 // Loads an email template and compiles it
-function loadEmailTemplate ($template, $content = array(), $userid = '0') {
+function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadUserData = true) {
        global $DATA;
 
        // Make sure all template names are lowercase!
@@ -452,7 +452,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
 
                // Merge data if valid
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - PRE<br />");
-               if (isUserDataValid()) {
+               if ((isUserDataValid()) && ($loadUserData === true)) {
                        $content = merge_array($content, getUserDataArray());
                } // END - if
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - AFTER<br />");