smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-06 19:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- bugfix on compiler object destruction. compiler_object property was by mistake unset.
This commit is contained in:
uwe.tews@googlemail.com
2011-03-16 23:57:04 +00:00
parent 91c2c9ae1d
commit 6b0f3a6ede
3 changed files with 226 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
change_log.txt
View File

@@ -1,4 +1,8 @@
===== SVN trunk ===== ===== 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 09/03/2011
-bugfix a variable filter should run before modifers on an output tag (see change of 23/07/2010) -bugfix a variable filter should run before modifers on an output tag (see change of 23/07/2010)

2
libs/sysplugins/smarty_internal_function_call_handler.php
View File

@@ -22,7 +22,7 @@ class Smarty_Internal_Function_Call_Handler extends Smarty_Internal_Template {
if (!is_callable($_function)) { if (!is_callable($_function)) {
$_code = "function {$_function}(\$_smarty_tpl,\$params) { $_code = "function {$_function}(\$_smarty_tpl,\$params) {
\$saved_tpl_vars = \$_smarty_tpl->tpl_vars; \$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);}?>"; foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
if ($_nocache) { if ($_nocache) {
$_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!", $_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!",

4
libs/sysplugins/smarty_internal_template.php
View File

@@ -280,9 +280,9 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
$this->compiler_object->parser->current_buffer, $this->compiler_object->parser->current_buffer,
$this->compiler_object->parser, $this->compiler_object->parser,
$this->compiler_object->lex, $this->compiler_object->lex,
$this->compiler_object->template, $this->compiler_object->template
$this->compiler_object
); );
$this->compiler_object = null;
} }
/** /**