Rewrites/fixes for handling config entries in SQLs

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

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index eebeb6c0d961266befcbc21716c87dc9fb15f54a..c114e317731b521ac5c6ceb5e6f9294273e775a2 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -115,7 +115,7 @@ function doExpressionUser ($data) {
        } // END - if
 
        // Generate replacer
-       $replacer = '{DQUOTE} . ' . $functionName . ' . "';
+       $replacer = '{DQUOTE} . ' . $functionName . ' . {DQUOTE}';
 
        // Now replace the code
        $code = replaceExpressionCode($data, $replacer);
@@ -152,13 +152,7 @@ function doExpressionExt ($data) {
 // @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 function doExpressionConfig ($data) {
        // Default replacer is the config value itself
-       $replacer = '{DQUOTE} . getConfig(' . "'" . $data['matches'][4][$data['key']] . "'" . ') . {DQUOTE}';
-
-       // Is there a call-back function provided?
-       if (!empty($data['callback'])) {
-               // Construct a new expression
-               $replacer = '{%pipe,' . $data['callback'] . ',' . $configValue . '%}';
-       } // END - if
+       $replacer = '{DQUOTE}  . ' . $data['callback'] . '(getConfig(' . "'" . $data['matches'][4][$data['key']] . "'" . ')) . {DQUOTE}';
 
        // Replace the config entry
        $code = replaceExpressionCode($data, $replacer);