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

- bugfix custom cache resource did not observe compile_id and cache_id when $cache_locking == true

Browse Source
This commit is contained in:
Uwe Tews
2015-05-10 12:00:19 +02:00
parent edf49ca3cf
commit 5ce5d4df49
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/sysplugins/smarty_cacheresource_custom.php
View File

@@ -182,9 +182,9 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
public function readCachedContent(Smarty_Internal_Template $_template) public function readCachedContent(Smarty_Internal_Template $_template)
{ {
$content = $_template->cached->content ? $_template->cached->content : null; $content = $_template->cached->content ? $_template->cached->content : null;
$timestamp = null; $timestamp = null;
if ($content === null) { if ($content === null) {
$timestamp = null; $timestamp = null;
$this->fetch( $this->fetch(
$_template->cached->filepath, $_template->cached->filepath,
$_template->source->name, $_template->source->name,
@@ -269,15 +269,14 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
*/ */
public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached) public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
{ {
$id = $cached->lock_id; $id = $cached->lock_id;
$name = $cached->source->name . '.lock'; $name = $cached->source->name . '.lock';
$mtime = $this->fetchTimestamp($id, $name, null, null); $mtime = $this->fetchTimestamp($id, $name, $cached->cache_id, $cached->compile_id);
if ($mtime === null) { if ($mtime === null) {
$this->fetch($id, $name, null, null, $content, $mtime); $this->fetch($id, $name, $cached->cache_id, $cached->compile_id, $content, $mtime);
} }
$stat = $mtime && ($t = time()) - $mtime < $smarty->locking_timeout; return $mtime && ($t = time()) - $mtime < $smarty->locking_timeout;
return $stat ? $mtime : $stat;
} }
/** /**
@@ -291,7 +290,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached) public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
{ {
$cached->is_locked = true; $cached->is_locked = true;
$id = $cached->lock_id; $id = $cached->lock_id;
$name = $cached->source->name . '.lock'; $name = $cached->source->name . '.lock';
$this->save($id, $name, $cached->cache_id, $cached->compile_id, $smarty->locking_timeout, ''); $this->save($id, $name, $cached->cache_id, $cached->compile_id, $smarty->locking_timeout, '');
} }
@@ -308,6 +307,6 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
{ {
$cached->is_locked = false; $cached->is_locked = false;
$name = $cached->source->name . '.lock'; $name = $cached->source->name . '.lock';
$this->delete($name, $cached->cache_id, $cached->compile_id, null); $this->delete($name, $cached->cache_id, $cached->compile_id, null);
} }
} }