X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FSmarty%2Fplugins%2Ffunction.crmResPath.php;h=01b47198a2c38a8f1ce3f093ec7921cac778c078;hb=016d95d3fe033f468b551b42bdc96e194f73e553;hp=5ae70638920c5d930113f35ac7144ce46df38b1f;hpb=7a88e045914e81a53e30af54aee578baa9ff0220;p=civicrm-core.git

diff --git a/CRM/Core/Smarty/plugins/function.crmResPath.php b/CRM/Core/Smarty/plugins/function.crmResPath.php
index 5ae7063892..01b47198a2 100644
--- a/CRM/Core/Smarty/plugins/function.crmResPath.php
+++ b/CRM/Core/Smarty/plugins/function.crmResPath.php
@@ -1,27 +1,11 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
@@ -37,14 +21,21 @@
  * Determine the path of a resource file
  *
  * @param array $params
+ *   Identify the resource by either 'ext'+'file' or 'expr'.
+ *
  *   Array with keys:
  *   - ext: string, extension name. see CRM_Core_Resources::getPath
  *   - file: string, relative file path. see CRM_Core_Resources::getPath
+ *   - expr: string, a dynamic path expression. See: \Civi\Core\Paths::getPath()
  * @param CRM_Core_Smarty $smarty
  *
  * @return string
  */
 function smarty_function_crmResPath($params, &$smarty) {
+  if (!empty($params['expr'])) {
+    return Civi::paths()->getPath($params['expr']);
+  }
+
   $res = CRM_Core_Resources::singleton();
   if (!array_key_exists('ext', $params)) {
     $params['ext'] = 'civicrm';