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

- bugfix the internal resource cache did not observe config_dir changes (forum topic 24493)

Browse Source
This commit is contained in:
Uwe.Tews@googlemail.com
2013-08-13 20:54:59 +00:00
parent 518ffca6f5
commit 3ad903ad21
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== trunk ===== ===== trunk =====
13.08.2013
- bugfix the internal resource cache did not observe config_dir changes (forum topic 24493)
12.08.2013 12.08.2013
- bugfix internal $tmpx variables must be unique over all inheritance templates (Issue 149) - bugfix internal $tmpx variables must be unique over all inheritance templates (Issue 149)

11
libs/sysplugins/smarty_resource.php
View File

@@ -97,11 +97,16 @@ abstract class Smarty_Resource
* *
* @param Smarty $smarty Smarty instance * @param Smarty $smarty Smarty instance
* @param string $resource_name resource_name to make unique * @param string $resource_name resource_name to make unique
* @param boolean $is_config flag for config resource
* @return string unique resource name * @return string unique resource name
*/ */
protected function buildUniqueResourceName(Smarty $smarty, $resource_name) protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false)
{ {
return get_class($this) . '#' . $smarty->joined_template_dir . '#' . $resource_name; if ($is_config) {
return get_class($this) . '#' . $smarty->joined_config_dir . '#' . $resource_name;
} else {
return get_class($this) . '#' . $smarty->joined_template_dir . '#' . $resource_name;
}
} }
/** /**
@@ -562,7 +567,7 @@ abstract class Smarty_Resource
// load resource handler, identify unique resource name // load resource handler, identify unique resource name
$resource = Smarty_Resource::load($smarty, $type); $resource = Smarty_Resource::load($smarty, $type);
$unique_resource_name = $resource->buildUniqueResourceName($smarty, $name); $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name, true);
// check runtime cache // check runtime cache
$_cache_key = 'config|' . $unique_resource_name; $_cache_key = 'config|' . $unique_resource_name;