From: Tim Otten <totten@civicrm.org>
Date: Tue, 10 Mar 2020 10:44:32 +0000 (-0700)
Subject: CRM_Core_I18n - Fix usage of `getPath('[foo]/.')`
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f64df9e73e25b3f425718b3988a6ff51e47e8330;p=civicrm-core.git

CRM_Core_I18n - Fix usage of `getPath('[foo]/.')`

The interpretation of `/.` is evolving per #16735:

* When this code was first written, it was unspecified/variable whether the value `[foo]/.` would end in `/`
* During most of the testing of 5.23.beta1, this was defined to always return `/`
* During a regression fix in 5.23.1, we're flipping it back the other way so that `[foo]/.` never ends in `/`.
---

diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php
index 1da5d28005..aff19c9f80 100644
--- a/CRM/Core/I18n.php
+++ b/CRM/Core/I18n.php
@@ -282,7 +282,7 @@ class CRM_Core_I18n {
    * @return string
    */
   public static function getResourceDir() {
-    return \Civi::paths()->getPath('[civicrm.l10n]/.');
+    return CRM_Utils_File::addTrailingSlash(\Civi::paths()->getPath('[civicrm.l10n]/.'));
   }
 
   /**