Major rewrite of template system:

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

diff --git a/inc/xml-functions.php b/inc/xml-functions.php
index d31c992014f3966a9d4ad71afd88503b38a40916..3fc94edf0630eb861796ff4483fbfd128a7ab7ca 100644 (file)
--- a/inc/xml-functions.php
+++ b/inc/xml-functions.php
@@ -79,15 +79,15 @@ function doGenericXmlTemplateCallback ($template, $content = array(), $compileCo
        // Is it again readable?
        if (isFileReadable($FQFN)) {
                // Is there cache?
-               if ((!isDebuggingTemplateCache()) && (isTemplateCached('xml', $template))) {
+               if ((!isDebugTemplateCacheEnabled()) && (isTemplateCached('xml', $template))) {
                        // Evaluate the cache
-                       eval(readTemplateCache('xml', $template));
+                       $templateContent = readTemplateCache('xml', $template, $content);
                } else {
                        // Read it
                        $templateContent = readFromFile($FQFN);
 
                        // Prepare it for finaly eval() command
-                       $GLOBALS['template_eval']['xml'][$template] = '$templateContent = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($templateContent), FALSE, TRUE, TRUE, $compileCode) . '");';
+                       $GLOBALS['template_eval']['xml'][$template] = '$templateContent = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($templateContent), TRUE, $compileCode) . '");';
 
                        // Eval the code, this does insert any array elements from $content
                        eval($GLOBALS['template_eval']['xml'][$template]);
@@ -136,7 +136,7 @@ function parseXmlData ($content) {
        // Is there recode?
        if (!function_exists('recode')) {
                // No fallback ATM
-               reportBug('PHP extension recode is missing. Please install it.');
+               reportBug(__FUNCTION__, __LINE__, 'PHP extension recode is missing. Please install it.');
        } // END - if
 
        // Convert HTML entities to UTF-8