smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2026-05-03 19:30:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

get rid of smarty object self pointer

Browse Source
This commit is contained in:
Uwe Tews
2015-02-15 01:45:37 +01:00
parent f93cfc63ad
commit 8082bc7471
7 changed files with 109 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/sysplugins/smarty_resource.php
+4 -3
View File
@@ -250,15 +250,16 @@ abstract class Smarty_Resource
*/
public static function getUniqueTemplateName($template, $template_resource)
{
list($name, $type) = self::parseResourceName($template_resource, $template->smarty->default_resource_type);
$smarty = isset($template->smarty) ? $template->smarty : $template;
list($name, $type) = self::parseResourceName($template_resource, $smarty->default_resource_type);
// TODO: optimize for Smarty's internal resource types
$resource = Smarty_Resource::load($template->smarty, $type);
$resource = Smarty_Resource::load($smarty, $type);
// go relative to a given template?
$_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/');
if ($template instanceof Smarty_Internal_Template && $_file_is_dotted && ($template->source->type == 'file' || $template->parent->source->type == 'extends')) {
$name = dirname($template->source->filepath) . DS . $name;
}
return $resource->buildUniqueResourceName($template->smarty, $name);
return $resource->buildUniqueResourceName($smarty, $name);
}
/**