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

- fixed bug loading modifiers in child template at template inheritance

Browse Source
This commit is contained in:
Uwe.Tews
2009-12-28 20:46:31 +00:00
parent 5d6b87d9a1
commit 589f736efa
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
change_log.txt
View File

@@ -1,7 +1,7 @@
12/28/2009 12/28/2009
- update for security fixes - update for security fixes
- make modifier plugins always trusted - make modifier plugins always trusted
- adding md5 to nocache_hash - fixed bug loading modifiers in child template at template inheritance
12/27/2009 12/27/2009
--- this is a major update with a couple of internal changes --- --- this is a major update with a couple of internal changes ---

1
libs/sysplugins/smarty_internal_compile_block.php
View File

@@ -79,6 +79,7 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase {
} }
$compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']); $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
$compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']); $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']);
$compiler->template->required_plugins = array_merge_recursive($compiler->template->required_plugins, $_tpl->required_plugins);
unset($_tpl); unset($_tpl);
} else { } else {
$_output = $compiler->template->extracted_compiled_code; $_output = $compiler->template->extracted_compiled_code;