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

- bugfix change from 01.03.2016 will cause $smarty->isCached(..) failure if called multiple time for same template

Browse Source 
(forum topic 25935) related to 825aa26079
This commit is contained in:
uwetews
2016-03-04 17:54:10 +01:00
parent 4f5aeeb2b6
commit d88168d1b6
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
change_log.txt
View File

@@ -1,4 +1,8 @@
 ===== 3.1.30-dev ===== (xx.xx.xx)  ===== 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 02.03.2016
- revert autoloader optimizations because of unexplainable warning when using plugins https://github.com/smarty-php/smarty/issues/199 - revert autoloader optimizations because of unexplainable warning when using plugins https://github.com/smarty-php/smarty/issues/199

4
libs/Smarty.class.php
View File

@@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.30-dev/51'; const SMARTY_VERSION = '3.1.30-dev/52';
/** /**
* define variable scopes * define variable scopes
@@ -1051,7 +1051,7 @@ class Smarty extends Smarty_Internal_TemplateBase
if ($this->caching && isset($this->_cache[ 'isCached' ][ $_templateId ])) { if ($this->caching && isset($this->_cache[ 'isCached' ][ $_templateId ])) {
$tpl = $do_clone ? clone $this->_cache[ 'isCached' ][ $_templateId ] : $tpl = $do_clone ? clone $this->_cache[ 'isCached' ][ $_templateId ] :
$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 ])) { } else if (!$do_clone && isset($this->_cache[ 'tplObjects' ][ $_templateId ])) {
$tpl = clone $this->_cache[ 'tplObjects' ][ $_templateId ]; $tpl = clone $this->_cache[ 'tplObjects' ][ $_templateId ];
} else { } else {