From 589f736efa957461b6e5645df3f04c1c89de391d Mon Sep 17 00:00:00 2001 From: "Uwe.Tews" Date: Mon, 28 Dec 2009 20:46:31 +0000 Subject: [PATCH] - fixed bug loading modifiers in child template at template inheritance --- change_log.txt | 2 +- libs/sysplugins/smarty_internal_compile_block.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/change_log.txt b/change_log.txt index 2fc2718e..38ae0718 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,7 +1,7 @@ 12/28/2009 - update for security fixes - make modifier plugins always trusted -- adding md5 to nocache_hash +- fixed bug loading modifiers in child template at template inheritance 12/27/2009 --- this is a major update with a couple of internal changes --- diff --git a/libs/sysplugins/smarty_internal_compile_block.php b/libs/sysplugins/smarty_internal_compile_block.php index 668bd28f..bb99755b 100644 --- a/libs/sysplugins/smarty_internal_compile_block.php +++ b/libs/sysplugins/smarty_internal_compile_block.php @@ -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['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); } else { $_output = $compiler->template->extracted_compiled_code;