projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9f965e1
)
MagicMerge - Fix style
author
Tim Otten
<totten@civicrm.org>
Tue, 27 Oct 2015 03:51:12 +0000
(20:51 -0700)
committer
Tim Otten
<totten@civicrm.org>
Tue, 27 Oct 2015 03:51:12 +0000
(20:51 -0700)
CRM/Core/Config/MagicMerge.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/Config/MagicMerge.php
b/CRM/Core/Config/MagicMerge.php
index 7af026634eca9c6c479f3009a6a2cfe6a9e2b908..39a0a493f5700a728d539aa528f294b13545d06d 100644
(file)
--- a/
CRM/Core/Config/MagicMerge.php
+++ b/
CRM/Core/Config/MagicMerge.php
@@
-234,7
+234,7
@@
class CRM_Core_Config_MagicMerge {
case 'setting-url-abs':
case 'setting-url-rel':
$type = (strstr($type, 'abs')) ? 'absolute' : 'relative';
- $value =
CRM_Utils_File::addTrailingSlash($this->getSettings()->get($name));
+ $value = CRM_Utils_File::addTrailingSlash($this->getSettings()->get($name));
$this->cache[$k] = Civi::paths()->getUrl($value, $type);
return $this->cache[$k];