Renamed form fields to separate them from others

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

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index f39e314a3ad467a0515e898da434caeff94658cd..a7dcfcac86e9c47f55223b7d473265c81af93659 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -192,8 +192,11 @@ function doExpressionPipe ($data) {
                if ((empty($data['value'])) && ($data['value'] != '0')) {
                        // No value is set
                        $replacer = '{DQUOTE} . ' . $data['extra_func2'] . '(' . $data['extra_func'] . '(' . $data['callback'] . '())) . {DQUOTE}';
+               } elseif (isXmlTypeBool($data['value'])) {
+                       // Boolean value detected
+                       $replacer = '{DQUOTE} . ' . $data['extra_func2'] . '(' . $data['extra_func'] . '(' . $data['callback'] . '(' . $data['value'] . '))) . {DQUOTE}';
                } else {
-                       // Some value is set
+                       // Some string/integer value is set
                        $replacer = '{DQUOTE} . ' . $data['extra_func2'] . '(' . $data['extra_func'] . '(' . $data['callback'] . "('" . $data['value'] . "'))) . {DQUOTE}";
                }
        } // END - if
@@ -268,7 +271,7 @@ function doExpressionTemplate ($data) {
        $callback = 'doTemplate' . $data['callback'];
 
        // Init replacer
-       $replacer = '<!-- ['.__FUNCTION__.':'.__LINE__.'] Call-back function ' . $callback  . ' does not exist. //-->';
+       $replacer = '<!-- [' . __FUNCTION__ . ':' . __LINE__.'] Call-back function ' . $callback  . ' does not exist. //-->';
 
        // Is the function there?
        if (function_exists($callback)) {