- bugfix for {function} block tags in included templates

This commit is contained in:
Uwe.Tews
2009-11-09 20:56:50 +00:00
parent 9f77baac25
commit 6f7896c87b
2 changed files with 3 additions and 2 deletions

View File

@@ -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

View File

@@ -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;
}