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

- bugfix a subtemplate later used as main template did use old variable values

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2011-11-24 21:08:26 +00:00
parent 8b414e3b8a
commit e8a933e8e0
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== trunk ===== ===== trunk =====
24.11.2011
- bugfix a subtemplate later used as main template did use old variable values
21.11.2011 21.11.2011
- bugfix cache file could include unneeded modifier plugins under certain condition - bugfix cache file could include unneeded modifier plugins under certain condition

5
libs/Smarty.class.php
View File

@@ -1191,6 +1191,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
$tpl = clone $this->template_objects[$_templateId]; $tpl = clone $this->template_objects[$_templateId];
$tpl->smarty = clone $tpl->smarty; $tpl->smarty = clone $tpl->smarty;
$tpl->parent = $parent; $tpl->parent = $parent;
$tpl->tpl_vars = array();
$tpl->config_vars = array();
} else { } else {
$tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id); $tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id);
} }
@@ -1198,6 +1200,9 @@ class Smarty extends Smarty_Internal_TemplateBase {
if (isset($this->template_objects[$_templateId])) { if (isset($this->template_objects[$_templateId])) {
// return cached template object // return cached template object
$tpl = $this->template_objects[$_templateId]; $tpl = $this->template_objects[$_templateId];
$tpl->parent = $parent;
$tpl->tpl_vars = array();
$tpl->config_vars = array();
} else { } else {
$tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id); $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
} }