Fixes and further rewrites to make use of EL

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

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index d44b587edd383f13af1092c55121bfb839e7940b..458dd1792c3a244f790bc723f3aca25b71d662a4 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -220,10 +220,16 @@ function doExpressionValidatorLinks ($data) {
 
 // Expression call-back for dynamic messages
 function doExpressionMessage ($data) {
+       // Debug message
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callback=' . $data['callback'] . ',extra_func=' . $data['extra_func'] . ',value=' . $data['value']);
+
        // Message string replacement depends on if message is masked
        if ((isMessageMasked($data['callback'])) && ((!empty($data['extra_func'])) || ($data['extra_func'] == '0'))) {
                // Message should be masked
                $replacer = "{DQUOTE} . getMaskedMessage('" . $data['callback'] . "', '" . $data['extra_func'] . "') . {DQUOTE}";
+       } elseif (!empty($data['value'])) {
+               // value is set, so it is masked message
+               $replacer = "{DQUOTE} . getMaskedMessage('" . $data['callback'] . "', '" . $data['value'] . "') . {DQUOTE}";
        } else {
                // Regular message
                $replacer = "{DQUOTE} . getMessage('" . $data['callback'] . "') . {DQUOTE}";