From 4c2e54d8150e65fa0b690b4de7d3a2ad1bf537a2 Mon Sep 17 00:00:00 2001 From: monishdeb Date: Thu, 1 Oct 2015 03:07:48 +0530 Subject: [PATCH] 4.7 broken links on Drupal upgrade --- CRM/Core/Config/MagicMerge.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CRM/Core/Config/MagicMerge.php b/CRM/Core/Config/MagicMerge.php index f8ea50f733..8b72f09e51 100644 --- a/CRM/Core/Config/MagicMerge.php +++ b/CRM/Core/Config/MagicMerge.php @@ -232,13 +232,10 @@ class CRM_Core_Config_MagicMerge { return $value; case 'setting-url-abs': - $value = $this->getSettings()->get($name); - $this->cache[$k] = Civi::paths()->getUrl($value, 'absolute'); - return $this->cache[$k]; - case 'setting-url-rel': - $value = $this->getSettings()->get($name); - $this->cache[$k] = Civi::paths()->getUrl($value, 'relative'); + $type = (strstr($type, 'abs')) ? 'absolute' : 'relative'; + $value = CRM_Utils_File::addTrailingSlash($this->getSettings()->get($name)); + $this->cache[$k] = Civi::paths()->getUrl($value, $type); return $this->cache[$k]; case 'runtime': -- 2.25.1