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 of smaller performance issue introduce in 3.1.22 when caching is enabled

Browse Source
This commit is contained in:
Uwe Tews
2015-05-12 03:34:38 +02:00
parent b4792df08a
commit d234625d7c
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libs/sysplugins/smarty_template_cached.php
View File

@@ -150,18 +150,18 @@ class Smarty_Template_Cached
while (true) { while (true) {
while (true) { while (true) {
if ($this->exists === false || $_template->smarty->force_compile || $_template->smarty->force_cache) { if ($this->exists === false || $_template->smarty->force_compile || $_template->smarty->force_cache) {
$valid = false; $this->valid = false;
} else { } else {
$valid = true; $this->valid = true;
} }
if ($valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)) { if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)) {
// lifetime expired // lifetime expired
$valid = false; $this->valid = false;
} }
if ($valid && $_template->source->timestamp > $this->timestamp) { if ($this->valid && $_template->source->timestamp > $this->timestamp) {
$valid = false; $this->valid = false;
} }
if ($valid || !$_template->smarty->cache_locking) { if ($this->valid || !$_template->smarty->cache_locking) {
break; break;
} }
if (!$this->handler->locked($_template->smarty, $this)) { if (!$this->handler->locked($_template->smarty, $this)) {
@@ -170,14 +170,14 @@ class Smarty_Template_Cached
} }
$this->handler->populate($this, $_template); $this->handler->populate($this, $_template);
} }
if ($valid) { if ($this->valid) {
if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) { if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
// load cache file for the following checks // load cache file for the following checks
if ($_template->smarty->debugging) { if ($_template->smarty->debugging) {
Smarty_Internal_Debug::start_cache($_template); Smarty_Internal_Debug::start_cache($_template);
} }
if ($this->handler->process($_template, $this) === false) { if ($this->handler->process($_template, $this) === false) {
$valid = false; $this->valid = false;
} else { } else {
$this->processed = true; $this->processed = true;
} }
@@ -189,21 +189,21 @@ class Smarty_Template_Cached
continue; continue;
} }
} else { } else {
return $this->valid = $valid; return $this->valid;
} }
if ($valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->properties['cache_lifetime'] >= 0 && (time() > ($_template->cached->timestamp + $_template->properties['cache_lifetime']))) { if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->properties['cache_lifetime'] >= 0 && (time() > ($_template->cached->timestamp + $_template->properties['cache_lifetime']))) {
$valid = false; $this->valid = false;
} }
if ($_template->smarty->cache_locking) { if ($_template->smarty->cache_locking) {
if (!$valid) { if (!$this->valid) {
$this->handler->acquireLock($_template->smarty, $this); $this->handler->acquireLock($_template->smarty, $this);
} elseif ($this->is_locked) { } elseif ($this->is_locked) {
$this->handler->releaseLock($_template->smarty, $this); $this->handler->releaseLock($_template->smarty, $this);
} }
} }
return $this->valid = $valid; return $this->valid;
} }
return $this->valid = false; return $this->valid;
} }
/** /**