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

- add Smarty::$allow_ambiguous_resources to activate unique resource handling (Forum Topic 20128)

Browse Source 
see http://www.smarty.net/forums/viewtopic.php?t=20128
This commit is contained in:
rodneyrehm
2011-10-21 18:40:16 +00:00
parent 6baca38bf1
commit 7659c6c0ea
6 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -2,6 +2,7 @@
21.10.2011
- bugfix apostrophe in plugins_dir path name failed (forum topic 20199)
- improvement sha1() for array keys longer than 150 characters
- add Smarty::$allow_ambiguous_resources to activate unique resource handling (Forum Topic 20128)
20.10.2011
- @silenced unlink() in Smarty_Internal_Write_File since debuggers go haywire without it.

12
libs/Smarty.class.php
View File

@@ -251,6 +251,11 @@ class Smarty extends Smarty_Internal_TemplateBase {
* @var boolean
*/
public $use_sub_dirs = false;
/**
* allow ambiguous resources (that are made unique by the resource handler)
* @var boolean
*/
public $allow_ambiguous_resources = false;
/**
* caching enabled
* @var boolean
@@ -1172,8 +1177,11 @@ class Smarty extends Smarty_Internal_TemplateBase {
$cache_id = $cache_id === null ? $this->cache_id : $cache_id;
$compile_id = $compile_id === null ? $this->compile_id : $compile_id;
// already in template cache?
$unique_template_name = Smarty_Resource::getUniqueTemplateName($this, $template);
$_templateId = $unique_template_name . $cache_id . $compile_id;
if ($this->allow_ambiguous_resources) {
$_templateId = Smarty_Resource::getUniqueTemplateName($this, $template) . $cache_id . $compile_id;
} else {
$_templateId = $this->joined_template_dir . '#' . $template . $cache_id . $compile_id;
}
if (isset($_templateId[150])) {
$_templateId = sha1($_templateId);
}

6
libs/sysplugins/smarty_cacheresource_keyvaluestore.php
View File

@@ -178,7 +178,11 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
}
// remove from template cache
$_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
if ($smarty->allow_ambiguous_resources) {
$_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
} else {
$_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
}
if (isset($_templateId[150])) {
$_templateId = sha1($_templateId);
}

6
libs/sysplugins/smarty_internal_cacheresource_file.php
View File

@@ -154,7 +154,11 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
// remove from template cache
$tpl->source; // have the template registered before unset()
$_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
if ($smarty->allow_ambiguous_resources) {
$_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
} else {
$_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
}
if (isset($_templateId[150])) {
$_templateId = sha1($_templateId);
}

15
libs/sysplugins/smarty_internal_template.php
View File

@@ -245,8 +245,12 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope)
{
// already in template cache?
$unique_template_name = Smarty_Resource::getUniqueTemplateName($this->smarty, $template);
$_templateId = $unique_template_name . $cache_id . $compile_id;
if ($this->smarty->allow_ambiguous_resources) {
$_templateId = Smarty_Resource::getUniqueTemplateName($this->smarty, $template) . $cache_id . $compile_id;
} else {
$_templateId = $this->smarty->joined_template_dir . '#' . $template . $cache_id . $compile_id;
}
if (isset($_templateId[150])) {
$_templateId = sha1($_templateId);
}
@@ -625,7 +629,12 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
// cache template object under a unique ID
// do not cache eval resources
if ($this->source->type != 'eval') {
$_templateId = $this->source->unique_resource . $this->cache_id . $this->compile_id;
if ($this->smarty->allow_ambiguous_resources) {
$_templateId = $this->source->unique_resource . $this->cache_id . $this->compile_id;
} else {
$_templateId = $this->smarty->joined_template_dir . '#' . $this->template_resource . $this->cache_id . $this->compile_id;
}
if (isset($_templateId[150])) {
$_templateId = sha1($_templateId);
}

6
libs/sysplugins/smarty_internal_utility.php
View File

@@ -192,7 +192,11 @@ class Smarty_Internal_Utility {
// remove from template cache
$tpl->source; // have the template registered before unset()
$_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
if ($smarty->allow_ambiguous_resources) {
$_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
} else {
$_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
}
if (isset($_templateId[150])) {
$_templateId = sha1($_templateId);
}