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

get rid of reference parameter

Browse Source
This commit is contained in:
Uwe Tews
2015-02-14 21:57:42 +01:00
parent 6925c98af0
commit f93cfc63ad
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/sysplugins/smarty_resource.php
View File

@@ -213,12 +213,10 @@ abstract class Smarty_Resource
* *
* @param string $resource_name template_resource or config_resource to parse * @param string $resource_name template_resource or config_resource to parse
* @param string $default_resource the default resource_type defined in $smarty * @param string $default_resource the default resource_type defined in $smarty
* @param string &$name the parsed resource name
* @param string &$type the parsed resource type
* *
* @return void * @return array with parsed resource name and type
*/ */
public static function parseResourceName($resource_name, $default_resource, &$name, &$type) public static function parseResourceName($resource_name, $default_resource)
{ {
$parts = explode(':', $resource_name, 2); $parts = explode(':', $resource_name, 2);
if (!isset($parts[1]) || !isset($parts[0][1])) { if (!isset($parts[1]) || !isset($parts[0][1])) {
@@ -230,6 +228,7 @@ abstract class Smarty_Resource
$type = $parts[0]; $type = $parts[0];
$name = $parts[1]; $name = $parts[1];
} }
return array($name, $type);
} }
/** /**
@@ -251,7 +250,7 @@ abstract class Smarty_Resource
*/ */
public static function getUniqueTemplateName($template, $template_resource) public static function getUniqueTemplateName($template, $template_resource)
{ {
self::parseResourceName($template_resource, $template->smarty->default_resource_type, $name, $type); list($name, $type) = self::parseResourceName($template_resource, $template->smarty->default_resource_type);
// TODO: optimize for Smarty's internal resource types // TODO: optimize for Smarty's internal resource types
$resource = Smarty_Resource::load($template->smarty, $type); $resource = Smarty_Resource::load($template->smarty, $type);
// go relative to a given template? // go relative to a given template?

2
libs/sysplugins/smarty_template_config.php
View File

@@ -101,7 +101,7 @@ class Smarty_Template_Config extends Smarty_Template_Source
throw new SmartyException('Missing config name'); throw new SmartyException('Missing config name');
} }
// parse resource_name, load resource handler // parse resource_name, load resource handler
Smarty_Resource::parseResourceName($template_resource, $smarty->default_config_type, $name, $type); list($name, $type) = Smarty_Resource::parseResourceName($template_resource, $smarty->default_config_type);
// make sure configs are not loaded via anything smarty can't handle // make sure configs are not loaded via anything smarty can't handle
if (isset($_incompatible_resources[$type])) { if (isset($_incompatible_resources[$type])) {
throw new SmartyException ("Unable to use resource '{$type}' for config"); throw new SmartyException ("Unable to use resource '{$type}' for config");

2
libs/sysplugins/smarty_template_source.php
View File

@@ -177,7 +177,7 @@ class Smarty_Template_Source
throw new SmartyException('Missing template name'); throw new SmartyException('Missing template name');
} }
// parse resource_name, load resource handler, identify unique resource name // parse resource_name, load resource handler, identify unique resource name
Smarty_Resource::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type); list($name, $type) = Smarty_Resource::parseResourceName($template_resource, $smarty->default_resource_type);
$resource = Smarty_Resource::load($smarty, $type); $resource = Smarty_Resource::load($smarty, $type);
// if resource is not recompiling and resource name is not dotted we can check the source cache // if resource is not recompiling and resource name is not dotted we can check the source cache
if ($smarty->resource_caching && !$resource->recompiled && !(isset($name[1]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/'))) { if ($smarty->resource_caching && !$resource->recompiled && !(isset($name[1]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/'))) {