X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fexpression-functions.php;h=dd533a27a7cbcbc53ec6874c9eb99b024ae8c3d9;hp=e1098bf30180d37f6ba6543a3181e5ad7734e0e3;hb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;hpb=83b9addde2c2c88c714246712eb3b393909fcbd0 diff --git a/inc/expression-functions.php b/inc/expression-functions.php index e1098bf301..dd533a27a7 100644 --- a/inc/expression-functions.php +++ b/inc/expression-functions.php @@ -188,7 +188,8 @@ function doExpressionPipe ($data) { if (!empty($data['callback'])) { //if ($data['callback'] == 'getMemberId') die('
'.encodeEntities(print_r($data, true)).'
'); // If the value is empty, we don't add it - if (empty($data['value'])) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value[' . gettype($data['value']) . ']=' . $data['value']); + if ((empty($data['value'])) && ($data['value'] != '0')) { // No value is set $replacer = '{DQUOTE} . ' . $data['extra_func2'] . '(' . $data['extra_func'] . '(' . $data['callback'] . '())) . {DQUOTE}'; } else { @@ -263,14 +264,17 @@ function doExpressionMessage ($data) { // Expression call-back for template functions function doExpressionTemplate ($data) { + // Construct call-back function name + $callback = 'doTemplate' . $data['callback']; + // Init replacer - $replacer = ''; + $replacer = ''; // Is the function there? - if (function_exists($data['callback'])) { + if (function_exists($callback)) { // Do the replacement //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']); - $replacer = '{DQUOTE} . doTemplate' . $data['callback'] . "('" . $GLOBALS['current_template'] . "', true"; + $replacer = '{DQUOTE} . ' . $callback . "('" . $GLOBALS['current_template'] . "', true"; // Is 'value' set? if (!empty($data['value'])) {