- bugfix <?xml> tag did create wrong output when caching enabled and the tag was in included subtemplate

This commit is contained in:
uwe.tews@googlemail.com
2011-10-10 11:38:27 +00:00
parent 1cfdafccdd
commit d3258767a6
2 changed files with 3 additions and 2 deletions

View File

@@ -1,6 +1,7 @@
===== trunk ===== ===== trunk =====
10.10.2011 10.10.2011
- bugfix variable name typo in {html_options} and {html_checkboxes} (Issue #54) - bugfix variable name typo in {html_options} and {html_checkboxes} (Issue #54)
- bugfix <?xml> tag did create wrong output when caching enabled and the tag was in included subtemplate
===== Smarty-3.1.3 ===== ===== Smarty-3.1.3 =====
07.10.2011 07.10.2011

View File

@@ -249,10 +249,10 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data {
} }
} else { } else {
// var_dump('renderTemplate', $_template->has_nocache_code, $_template->template_resource, $_template->properties['nocache_hash'], $_template->parent->properties['nocache_hash'], $_output); // var_dump('renderTemplate', $_template->has_nocache_code, $_template->template_resource, $_template->properties['nocache_hash'], $_template->parent->properties['nocache_hash'], $_output);
if ($_template->has_nocache_code && !empty($_template->properties['nocache_hash']) && !empty($_template->parent->properties['nocache_hash'])) { if (!empty($_template->properties['nocache_hash']) && !empty($_template->parent->properties['nocache_hash'])) {
// replace nocache_hash // replace nocache_hash
$_output = preg_replace("/{$_template->properties['nocache_hash']}/", $_template->parent->properties['nocache_hash'], $_output); $_output = preg_replace("/{$_template->properties['nocache_hash']}/", $_template->parent->properties['nocache_hash'], $_output);
$_template->parent->has_nocache_code = $_template->has_nocache_code; $_template->parent->has_nocache_code = $_template->parent->has_nocache_code || $_template->has_nocache_code;
} }
} }
} else { } else {