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 add compile_id to cache key of of source (Issue 97)

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2012-05-24 17:03:31 +00:00
parent 35a68ed535
commit 179c62e4ef
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -2,6 +2,7 @@
24.05.2012 24.05.2012
- bugfix Smarty_Internal_Write_File::writeFile() could cause race-conditions on linux systems (Issue 101) - bugfix Smarty_Internal_Write_File::writeFile() could cause race-conditions on linux systems (Issue 101)
- bugfix attribute parameter names of plugins may now contain also "-" and ":" (Forum Topic 21856) - bugfix attribute parameter names of plugins may now contain also "-" and ":" (Forum Topic 21856)
- bugfix add compile_id to cache key of of source (Issue 97)
22.05.2012 22.05.2012
- bugfix recursive {include} within {section} did fail (Smarty developer group) - bugfix recursive {include} within {section} did fail (Smarty developer group)

7
libs/sysplugins/smarty_resource.php
View File

@@ -254,7 +254,7 @@ abstract class Smarty_Resource {
} }
} }
} }
$_stream_resolve_include_path = function_exists('stream_resolve_include_path'); $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
// relative file name? // relative file name?
@@ -271,7 +271,7 @@ abstract class Smarty_Resource {
} else { } else {
$_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath); $_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath);
} }
if ($_filepath !== false) { if ($_filepath !== false) {
if ($this->fileExists($source, $_filepath)) { if ($this->fileExists($source, $_filepath)) {
return $_filepath; return $_filepath;
@@ -493,6 +493,9 @@ abstract class Smarty_Resource {
// check runtime cache // check runtime cache
$_cache_key = 'template|' . $unique_resource_name; $_cache_key = 'template|' . $unique_resource_name;
if ($smarty->compile_id) {
$_cache_key .= '|'.$smarty->compile_id;
}
if (isset(self::$sources[$_cache_key])) { if (isset(self::$sources[$_cache_key])) {
return self::$sources[$_cache_key]; return self::$sources[$_cache_key];
} }