Further fixes for wrong getMaskedMessage() usage in 'compiled' code

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

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index c114e317731b521ac5c6ceb5e6f9294273e775a2..e112a20bf393504162f381418a00d1c4e837c668 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -221,7 +221,7 @@ function doExpressionValidatorLinks ($data) {
 // Expression call-back for dynamic messages
 function doExpressionMessage ($data) {
        // Message string replacement depends on if message is masked
-       if (isMessageMasked($data['callback'])) {
+       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}";
        } else {