Bug fixed :(

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

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 743e4a450b2096d1a2626491b2f12eb552b62ba9..4e78a9bd13e464177dc30b04dcd7227634c249eb 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -281,7 +281,7 @@ function doExpressionMessage ($data) {
 // Expression call-back for template functions
 function doExpressionTemplate ($data) {
        // Construct call-back function name
-       $callbackFunction = 'doTemplate' . $data['callback'];
+       $callbackFunction = 'doTemplate' . ucfirst($data['callback']);
 
        // Init replacer
        $replacer = '<!-- [' . __FUNCTION__ . ':' . __LINE__.'] Call-back function ' . $callbackFunction  . ' does not exist. //-->';
@@ -467,7 +467,7 @@ function doExpressionForm ($data) {
                        $data['__form_id'] = substr($value, 6);
                } elseif (substr($value, 0, 6) == 'server') {
                        // {%server,foo%} found
-                       $data['__server'] = '{%server=' . substr($value, 6) . '%}';
+                       $data['__server'] = '{%server,' . substr($value, 6) . '%}';
                }
        } // END - foreach