Charset fixed for SeCash, TODOs.txt updated, deprecated template removed

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

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 485e6195857e3e9d51e9fcf0ecb6161a2f03f051..5e2bb0a9ca7ab1df8753a8fe87e1c836a13e37ce 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -98,9 +98,9 @@ function doExpressionUser ($data) {
        }
 
        // Do we have another function to run (e.g. translations)
-       if (!empty($extraFunction)) {
+       if (!empty($data['extra_func'])) {
                // Surround the original function call with it
-               $functionName = $extraFunction . '(' . $functionName . ')';
+               $functionName = $data['extra_func'] . '(' . $functionName . ')';
        } // END - if
 
        // Now replace the code
@@ -132,6 +132,7 @@ function doExpressionExt ($data) {
 }
 
 // Expression call-back function for getting configuration data
+// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 function doExpressionConfig ($data) {
        // Read configuration
        $configValue = getConfig($data['matches'][4][$data['key']]);