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

- bugfix merge_compiled_includes flag was not restored correctly in {block} tag

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2010-09-24 12:13:19 +00:00
parent e8ab747a60
commit 802d40f3d3
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,3 +1,6 @@
24/09/2010
- bugfix merge_compiled_includes flag was not restored correctly in {block} tag
22/09/2010 22/09/2010
- bugfix on default modifier - bugfix on default modifier

2
libs/sysplugins/smarty_internal_compile_block.php
View File

@@ -108,7 +108,7 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase {
} }
$compiler->parser->current_buffer = $saved_data[1]; $compiler->parser->current_buffer = $saved_data[1];
$compiler->nocache = $saved_data[2]; $compiler->nocache = $saved_data[2];
$compiler->smarty->merge_compiled_includes = $saved_data[2]; $compiler->smarty->merge_compiled_includes = $saved_data[3];
// $_output content has already nocache code processed // $_output content has already nocache code processed
$compiler->suppressNocacheProcessing = true; $compiler->suppressNocacheProcessing = true;
// reset flag // reset flag