- bugfix cache resource was not loaded when caching was globally off but enabled at a template object

This commit is contained in:
Uwe.Tews
2010-01-25 18:10:35 +00:00
parent e89c15d65d
commit 8defafbb14
2 changed files with 9 additions and 3 deletions

View File

@@ -1,3 +1,6 @@
01/25/2010
- bugfix cache resource was not loaded when caching was globally off but enabled at a template object
01/22/2010
- new method $smarty->createData([$parent]) for creating a data object (required for bugfixes below)
- bugfix config_load() method now works also on a data object

View File

@@ -337,6 +337,9 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
if ($this->isCached === null) {
$this->isCached = false;
if (($this->caching == SMARTY_CACHING_LIFETIME_CURRENT || $this->caching == SMARTY_CACHING_LIFETIME_SAVED) && !$this->resource_object->isEvaluated && !$this->force_compile && !$this->force_cache) {
if (!isset($this->cache_resource_object)) {
$this->cache_resource_object = $this->smarty->loadCacheResource();
}
$cachedTimestamp = $this->getCachedTimestamp();
if ($cachedTimestamp === false) {
return $this->isCached;