diff --git a/NEWS b/NEWS index ea7489a2..9e610e65 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,10 @@ - - fixed problem with using assigned vars with {include_php ...} filepath + - fixed a problem with compile_id usage. (Andrei) + - fixed problem with using assigned vars with {include_php ...} filepath. (Monte) + Version 1.5.2 ------------- - - added Smarty object as fifth argument for template resource functions + - added Smarty object as fifth argument for template resource functions. (Monte) - fixed a bug with incorrectly combined cache and compile id in clear_cache(). (Andrei) diff --git a/Smarty.class.php b/Smarty.class.php index 0521cf38..1bf3edb7 100644 --- a/Smarty.class.php +++ b/Smarty.class.php @@ -539,6 +539,8 @@ class Smarty if (!isset($_smarty_compile_id)) $_smarty_compile_id = $this->compile_id; + $this->_compile_id = $_smarty_compile_id; + $this->_inclusion_depth = 0; if ($this->caching) { diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 0521cf38..1bf3edb7 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -539,6 +539,8 @@ class Smarty if (!isset($_smarty_compile_id)) $_smarty_compile_id = $this->compile_id; + $this->_compile_id = $_smarty_compile_id; + $this->_inclusion_depth = 0; if ($this->caching) {