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

- bugfix use template fullpath at §smarty->cache->clear(...), $smarty->clear_cache(....)

Browse Source
This commit is contained in:
Uwe.Tews
2010-02-08 21:04:43 +00:00
parent c2ff808db6
commit 24141e81dd
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -1,4 +1,5 @@
08/02/2010
- bugfix use template fullpath at <20>smarty->cache->clear(...), $smarty->clear_cache(....)
- bugfix of cache filename on extended templates when force_compile=true
07/02/2010

19
libs/sysplugins/smarty_internal_cacheresource_file.php
View File

@@ -29,7 +29,7 @@ class Smarty_Internal_CacheResource_File {
{
$_source_file_path = str_replace(':', '.', $_template->getTemplateFilepath());
$_cache_id = isset($_template->cache_id) ? preg_replace('![^\w\|]+!', '_', $_template->cache_id) : null;
$_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
$_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
$_filepath = $_template->templateUid;
// if use_sub_dirs, break file into directories
if ($this->smarty->use_sub_dirs) {
@@ -130,6 +130,14 @@ class Smarty_Internal_CacheResource_File {
$_cache_id_parts = explode('|', $_cache_id);
$_cache_id_parts_count = count($_cache_id_parts);
}
if (isset($resource_name)) {
$tpl = $this->smarty->createTemplate($resource_name);
if ($tpl->isExisting()) {
$_resourcename_parts = basename(str_replace('^','/',$tpl->getCachedFilepath()));
} else {
return 0;
}
}
$_count = 0;
$_cacheDirs = new RecursiveDirectoryIterator($_dir);
$_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
@@ -146,15 +154,10 @@ class Smarty_Internal_CacheResource_File {
$_parts_count = count($_parts);
// check name
if (isset($resource_name)) {
$_filename_parts = explode('.', $_parts[$_parts_count-1]);
$_resourcename_parts = explode('.', $resource_name . '.php');
if (count($_filename_parts)-1 != count($_resourcename_parts)) {
if ($_parts[$_parts_count-1] != $_resourcename_parts) {
continue;
}
for ($i = 0; $i < count($_resourcename_parts); $i++) {
if ($_filename_parts[$i + 1] != $_resourcename_parts[$i]) continue 2;
}
}
}
// check compile id
if (isset($_compile_id) && $_parts[$_parts_count-2 - $_compile_id_offset] != $_compile_id) {
continue;