- bugfix on default {function} parameters when {function} was used in nocache sections

- bugfix on compiler object destruction. compiler_object property was by mistake unset.

change_log.txt

@@ -1,4 +1,8 @@
 ===== SVN trunk  =====
+17/03/2011
+- bugfix on default {function} parameters when {function} was used in nocache sections
+- bugfix on compiler object destruction. compiler_object property was by mistake unset.
+
 09/03/2011
 -bugfix a variable filter should run before modifers on an output tag (see change of 23/07/2010)
 

libs/sysplugins/smarty_internal_function_call_handler.php

@@ -1,10 +1,10 @@
 <?php
 /**
  * Smarty Internal Plugin Function Call Handler
- * 
+ *
  * @package Smarty
  * @subpackage PluginsInternal
- * @author Uwe Tews 
+ * @author Uwe Tews
  */
 
 /**
@@ -18,23 +18,23 @@ class Smarty_Internal_Function_Call_Handler extends Smarty_Internal_Template {
             $_template->smarty->template_functions[$_name]['called_nocache'] = true;
         } else {
             $_function = "smarty_template_function_{$_hash}_{$_name}";
-        } 
+        }
         if (!is_callable($_function)) {
             $_code = "function {$_function}(\$_smarty_tpl,\$params) {
     \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(trim(\$value,'\''));};
+    foreach (\$_smarty_tpl->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
     foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
             if ($_nocache) {
                 $_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!",
                         "!\\\'!"), array('', "'"), $_template->smarty->template_functions[$_name]['compiled']);
             } else {
                 $_code .= preg_replace("/{$_template->smarty->template_functions[$_name]['nocache_hash']}/", $_template->properties['nocache_hash'], $_template->smarty->template_functions[$_name]['compiled']);
-            } 
+            }
             $_code .= "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}";
             eval($_code);
-        } 
+        }
         $_function($_template, $_params);
-    } 
+    }
-} 
+}
 
 ?>