diff --git a/change_log.txt b/change_log.txt index 95b49c93..dbc8e794 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,6 +1,7 @@ 11/09/2009 - lexer/parser bugfix - new SMARTY_SPL_AUTOLOAD constant to control the autoloader option +- bugfix for {function} block tags in included templates 11/08/2009 - fixed alphanumeric array index diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php index 151f0ee9..8edc914a 100644 --- a/libs/sysplugins/smarty_internal_compile_include.php +++ b/libs/sysplugins/smarty_internal_compile_include.php @@ -64,8 +64,8 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase { } } } while ($must_compile); - if (isset($prop['file_dependency'])) { - $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $prop['file_dependency']); + if (isset($prop)) { + $compiler->template->properties = array_merge($compiler->template->properties, $prop); } $has_compiled_template = true; }