smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-07 03:44:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix on template inheritance when calling multiple child/parent relations

Browse Source
This commit is contained in:
Uwe.Tews
2010-03-23 16:51:48 +00:00
parent 7f64fdc593
commit 2e27c294b3
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,3 +1,6 @@
23/03/2010
- bugfix on template inheritance when calling multiple child/parent relations
22/03/2010 22/03/2010
- bugfix make directory separator operating system independend in compileAllTemplates() - bugfix make directory separator operating system independend in compileAllTemplates()

13
libs/Smarty.class.php
View File

@@ -167,7 +167,7 @@ class Smarty extends Smarty_Internal_Data {
// config var settings // config var settings
public $config_overwrite = true; //Controls whether variables with the same name overwrite each other. public $config_overwrite = true; //Controls whether variables with the same name overwrite each other.
public $config_booleanize = true; //Controls whether config values of on/true/yes and off/false/no get converted to boolean public $config_booleanize = true; //Controls whether config values of on/true/yes and off/false/no get converted to boolean
public $config_read_hidden = true; //Controls whether hidden config sections/vars are read from the file. public $config_read_hidden = true; //Controls whether hidden config sections/vars are read from the file.
// config vars // config vars
public $config_vars = array(); public $config_vars = array();
// assigned tpl vars // assigned tpl vars
@@ -221,7 +221,8 @@ class Smarty extends Smarty_Internal_Data {
// smarty object reference // smarty object reference
public $smarty = null; public $smarty = null;
// block data at template inheritance // block data at template inheritance
public $block_data = array(); public $block_data = array();
public $block_data_stack = array();
// block tag hierarchy // block tag hierarchy
public $_tag_stack = array(); public $_tag_stack = array();
// plugins // plugins
@@ -310,6 +311,8 @@ class Smarty extends Smarty_Internal_Data {
// get default Smarty data object // get default Smarty data object
$parent = $this; $parent = $this;
} }
array_push($this->block_data_stack, $this->block_data);
$this->block_data = array();
// create template object if necessary // create template object if necessary
($template instanceof $this->template_class)? $_template = $template : ($template instanceof $this->template_class)? $_template = $template :
$_template = $this->createTemplate ($template, $cache_id, $compile_id, $parent); $_template = $this->createTemplate ($template, $cache_id, $compile_id, $parent);
@@ -352,9 +355,11 @@ class Smarty extends Smarty_Internal_Data {
if ($this->debugging) { if ($this->debugging) {
Smarty_Internal_Debug::display_debug($this); Smarty_Internal_Debug::display_debug($this);
} }
$this->block_data = array_pop($this->block_data_stack);
return; return;
} else { } else {
// return fetched content // return fetched content
$this->block_data = array_pop($this->block_data_stack);
return $_output; return $_output;
} }
} }
@@ -707,7 +712,7 @@ class Smarty extends Smarty_Internal_Data {
// Smarty 2 BC // Smarty 2 BC
$this->_version = self::SMARTY_VERSION; $this->_version = self::SMARTY_VERSION;
return $this->_version; return $this->_version;
} }
return null; return null;
} }