Skip to content

Commit

Permalink
CRM_Core_I18n - Fix usage of getPath('[foo]/.')
Browse files Browse the repository at this point in the history
The interpretation of `/.` is evolving per civicrm#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 `/`.
  • Loading branch information
totten committed Mar 11, 2020
1 parent 021008c commit ba1e433
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CRM/Core/I18n.php
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ public function strarg($str) {
* @return string
*/
public static function getResourceDir() {
return \Civi::paths()->getPath('[civicrm.l10n]/.');
return CRM_Utils_File::addTrailingSlash(\Civi::paths()->getPath('[civicrm.l10n]/.'));
}

/**
Expand Down

0 comments on commit ba1e433

Please sign in to comment.