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

- bugfix $smarty->clearCache('some.tpl') did by mistake cache the template object

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2011-02-24 15:28:03 +00:00
parent dea3e1f83e
commit 34d5029469
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== SVN trunk ===== ===== SVN trunk =====
24/02/2011
- bugfix $smarty->clearCache('some.tpl') did by mistake cache the template object
18/02/2011 18/02/2011
- bugfix removed possible race condition when isCached() was called for an individually cached subtemplate - bugfix removed possible race condition when isCached() was called for an individually cached subtemplate
- bugfix force default debug.tpl to be loaded by the file resource when default_resource_type was modified - bugfix force default debug.tpl to be loaded by the file resource when default_resource_type was modified

6
libs/sysplugins/smarty_internal_cacheresource_file.php
View File

@@ -145,12 +145,14 @@ class Smarty_Internal_CacheResource_File {
$_save_stat = $this->smarty->caching; $_save_stat = $this->smarty->caching;
$this->smarty->caching = true; $this->smarty->caching = true;
$tpl = new $this->smarty->template_class($resource_name, $this->smarty); $tpl = new $this->smarty->template_class($resource_name, $this->smarty);
// remove from template cache
unset($this->smarty->template_objects[crc32($tpl->template_resource . $tpl->cache_id . $tpl->compile_id)]);
$this->smarty->caching = $_save_stat; $this->smarty->caching = $_save_stat;
if ($tpl->isExisting()) { if ($tpl->isExisting()) {
$_resourcename_parts = basename(str_replace('^', '/', $tpl->getCachedFilepath())); $_resourcename_parts = basename(str_replace('^', '/', $tpl->getCachedFilepath()));
// remove from template cache
unset($this->smarty->template_objects[sha1($tpl->template_resource . $tpl->cache_id . $tpl->compile_id)]);
} else { } else {
// remove from template cache
unset($this->smarty->template_objects[sha1($tpl->template_resource . $tpl->cache_id . $tpl->compile_id)]);
return 0; return 0;
} }
} }