diff --git a/change_log.txt b/change_log.txt index 603b5052..3273585e 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,8 @@  ===== 3.1.30-dev ===== (xx.xx.xx) + 04.03.2016 + - bugfix change from 01.03.2016 will cause $smarty->isCached(..) failure if called multiple time for same template + (forum topic 25935) + 02.03.2016 - revert autoloader optimizations because of unexplainable warning when using plugins https://github.com/smarty-php/smarty/issues/199 diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 8f1467d5..45b24085 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * smarty version */ - const SMARTY_VERSION = '3.1.30-dev/51'; + const SMARTY_VERSION = '3.1.30-dev/52'; /** * define variable scopes @@ -1051,7 +1051,7 @@ class Smarty extends Smarty_Internal_TemplateBase if ($this->caching && isset($this->_cache[ 'isCached' ][ $_templateId ])) { $tpl = $do_clone ? clone $this->_cache[ 'isCached' ][ $_templateId ] : $this->_cache[ 'isCached' ][ $_templateId ]; - $template->tpl_vars = $template->config_vars = array(); + $tpl->tpl_vars = $tpl->config_vars = array(); } else if (!$do_clone && isset($this->_cache[ 'tplObjects' ][ $_templateId ])) { $tpl = clone $this->_cache[ 'tplObjects' ][ $_templateId ]; } else {