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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
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 01/22/2010
- new method $smarty->createData([$parent]) for creating a data object (required for bugfixes below) - 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 - bugfix config_load() method now works also on a data object

9
libs/sysplugins/smarty_internal_template.php
View File

@@ -32,7 +32,7 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
public $resource_name = null; public $resource_name = null;
public $resource_object = null; public $resource_object = null;
private $isExisting = null; private $isExisting = null;
public $templateUid = ''; public $templateUid = '';
// Template source // Template source
public $template_filepath = null; public $template_filepath = null;
public $template_source = null; public $template_source = null;
@@ -260,7 +260,7 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
// compiling succeded // compiling succeded
if (!$this->resource_object->isEvaluated) { if (!$this->resource_object->isEvaluated) {
// write compiled template // write compiled template
Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->compiled_template, $this->smarty); Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->compiled_template, $this->smarty);
} }
} else { } else {
// error compiling template // error compiling template
@@ -337,6 +337,9 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
if ($this->isCached === null) { if ($this->isCached === null) {
$this->isCached = false; $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 (($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(); $cachedTimestamp = $this->getCachedTimestamp();
if ($cachedTimestamp === false) { if ($cachedTimestamp === false) {
return $this->isCached; return $this->isCached;
@@ -481,7 +484,7 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
eval("?>" . $output); eval("?>" . $output);
$this->rendered_content = ob_get_clean(); $this->rendered_content = ob_get_clean();
// write cache file content // write cache file content
$this->writeCachedContent($output); $this->writeCachedContent($output);
if ($this->smarty->debugging) { if ($this->smarty->debugging) {
Smarty_Internal_Debug::end_cache($this); Smarty_Internal_Debug::end_cache($this);
} }