From 62f01f29e577e40c0652a3a759885676a1bd0cb6 Mon Sep 17 00:00:00 2001 From: "uwe.tews@googlemail.com" Date: Mon, 12 Mar 2012 19:29:10 +0000 Subject: [PATCH] - bugfix template inheritance did set $merge_compiled_includes globally true --- change_log.txt | 1 + libs/sysplugins/smarty_internal_compile_block.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/change_log.txt b/change_log.txt index 700715f1..10289d7d 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,6 +1,7 @@ ===== trunk ===== 12.03.2012 - bugfix a double quoted string of "$foo" did not compile into PHP "$foo" (Forum Topic 21175) +- bugfix template inheritance did set $merge_compiled_includes globally true 03.03.2012 - optimization of compiling speed when same modifier was used several times diff --git a/libs/sysplugins/smarty_internal_compile_block.php b/libs/sysplugins/smarty_internal_compile_block.php index d40c3577..c5349674 100644 --- a/libs/sysplugins/smarty_internal_compile_block.php +++ b/libs/sysplugins/smarty_internal_compile_block.php @@ -260,7 +260,7 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase { // reset flags $compiler->parser->current_buffer = $saved_data[1]; $compiler->nocache = $saved_data[2]; - //$compiler->smarty->merge_compiled_includes = $saved_data[3]; + $compiler->smarty->merge_compiled_includes = $saved_data[3]; // reset flag for {block} tag $compiler->inheritance = false; // $_output content has already nocache code processed