From f93cfc63ad031f3b06e466ce336015a7666982dd Mon Sep 17 00:00:00 2001
From: Uwe Tews <uwe.tews@googlemail.com>
Date: Sat, 14 Feb 2015 21:57:42 +0100
Subject: [PATCH] get rid of reference parameter

---
 libs/sysplugins/smarty_resource.php        | 9 ++++-----
 libs/sysplugins/smarty_template_config.php | 2 +-
 libs/sysplugins/smarty_template_source.php | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libs/sysplugins/smarty_resource.php b/libs/sysplugins/smarty_resource.php
index 93c95ca4..006cd01f 100644
--- a/libs/sysplugins/smarty_resource.php
+++ b/libs/sysplugins/smarty_resource.php
@@ -213,12 +213,10 @@ abstract class Smarty_Resource
      *
      * @param  string $resource_name    template_resource or config_resource to parse
      * @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);
         if (!isset($parts[1]) || !isset($parts[0][1])) {
@@ -230,6 +228,7 @@ abstract class Smarty_Resource
             $type = $parts[0];
             $name = $parts[1];
         }
+        return array($name, $type);
     }
 
     /**
@@ -251,7 +250,7 @@ abstract class Smarty_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
         $resource = Smarty_Resource::load($template->smarty, $type);
         // go relative to a given template?
diff --git a/libs/sysplugins/smarty_template_config.php b/libs/sysplugins/smarty_template_config.php
index 22a3b0f5..f48d4711 100644
--- a/libs/sysplugins/smarty_template_config.php
+++ b/libs/sysplugins/smarty_template_config.php
@@ -101,7 +101,7 @@ class Smarty_Template_Config extends Smarty_Template_Source
             throw new SmartyException('Missing config name');
         }
         // 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
         if (isset($_incompatible_resources[$type])) {
             throw new SmartyException ("Unable to use resource '{$type}' for config");
diff --git a/libs/sysplugins/smarty_template_source.php b/libs/sysplugins/smarty_template_source.php
index edaa8e34..85d31315 100644
--- a/libs/sysplugins/smarty_template_source.php
+++ b/libs/sysplugins/smarty_template_source.php
@@ -177,7 +177,7 @@ class Smarty_Template_Source
             throw new SmartyException('Missing template 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);
         // 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] == '/'))) {