Several fixes for template engine, JavaScripts, etc.

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 3bcc77e333318a1fac6af9edc39d1ac9a55cdd88..d18c91e74191d8a4fa2e264f7635c50fb8bcdab4 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -452,27 +452,28 @@ function FILTER_COMPILE_EXTENSION ($code) {
        if ((count($matches) > 0) && (count($matches[3]) > 0)) {
                // Replace all matches
                foreach ($matches[3] as $key => $cmd) {
-                       // By default we have no extension installed, so 'false' is assumed
-                       $replacer = 'false';
+                       // Init replacer variable
+                       $replacer = '';
 
                        // Is the extension installed or code provided?
                        if ($cmd == 'code') {
                                // Code asked for
-                               $replacer = getCode($matches[4][$key]);
-                       } elseif (isExtensionActive($matches[4][$key])) {
+                               $replacer = "\".getCode(\"" . $matches[4][$key] . "\").\"";
+                       } else {
                                // Construct call-back function name
                                $functionName = 'getExtension' . ucfirst(strtolower($cmd));
 
-                               // Call the function
-                               $replacer = call_user_func_array($functionName, $matches[4][$key]);
-                       } // END - if
+                               // Construct call of the function
+                               $replacer = "\".call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)).\"";
+                       }
 
                        // Replace it and insert parameter for GET request
-                       $code = str_replace($matches[0][$key], sprintf("&%s=%s&rev=%s", $cmd, $replacer, getConfig('CURR_SVN_REVISION')), $code);
+                       $code = str_replace($matches[0][$key], sprintf("&%s=%s&rev=\".getConfig('CURR_SVN_REVISION').\"", $cmd, $replacer), $code);
                } // END - foreach
        } // END - if
 
        // Return compiled code
+       //* DEBUG: */ die('<pre>'.htmlentities($code).'</pre>');
        return $code;
 }