Cleanup smarty_function_crmScript

diff --git a/CRM/Core/Smarty/plugins/function.crmScript.php b/CRM/Core/Smarty/plugins/function.crmScript.php
index d1e336029fba886faad9665a60fa4617814ddd48..716a8a941de53d6fbbdf1e9cd1b0c0f61cb9b81e 100644 (file)
--- a/CRM/Core/Smarty/plugins/function.crmScript.php
+++ b/CRM/Core/Smarty/plugins/function.crmScript.php
@@ -48,20 +48,17 @@
  * @throws Exception
  */
 function smarty_function_crmScript($params, &$smarty) {
-  $res = CRM_Core_Resources::singleton();
-
-  if (empty($params['weight'])) {
-    $params['weight'] = CRM_Core_Resources::DEFAULT_WEIGHT;
-  }
-  if (empty($params['region'])) {
-    $params['region'] = CRM_Core_Resources::DEFAULT_REGION;
-  }
+  $params += array(
+    'weight' => CRM_Core_Resources::DEFAULT_WEIGHT,
+    'region' => CRM_Core_Resources::DEFAULT_REGION,
+    'ext' => 'civicrm',
+  );
 
   if (array_key_exists('file', $params)) {
-    $res->addScriptFile($params['ext'], $params['file'], $params['weight'], $params['region']);
+    Civi::resources()->addScriptFile($params['ext'], $params['file'], $params['weight'], $params['region']);
   }
   elseif (array_key_exists('url', $params)) {
-    $res->addScriptUrl($params['url'], $params['weight'], $params['region']);
+    Civi::resources()->addScriptUrl($params['url'], $params['weight'], $params['region']);
   }
   else {
     CRM_Core_Error::debug_var('crmScript_params', $params);

diff --git a/templates/CRM/Contribute/Form/Selector.tpl b/templates/CRM/Contribute/Form/Selector.tpl
index 02642415042a288a452a45caf30c6c4831fb2cf9..b2994bb0fc51b8c61e9b31a7a84fa479f8738722 100644 (file)
--- a/templates/CRM/Contribute/Form/Selector.tpl
+++ b/templates/CRM/Contribute/Form/Selector.tpl
@@ -103,5 +103,5 @@
 {/strip}
 
 {include file="CRM/common/pager.tpl" location="bottom"}
-{crmScript ext='civicrm' file='js/crm.expandRow.js'}
+{crmScript file='js/crm.expandRow.js'}