CRM_Utils_System - Cleanup useFrameworkRelativeBase

diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php
index 10bbb91370b64773fc08a41df72ed8517d740b2b..1fd5424126ca1725782bc5181ccee3d1bceb63e6 100644 (file)
--- a/CRM/Utils/System/Base.php
+++ b/CRM/Utils/System/Base.php
@@ -623,7 +623,7 @@ abstract class CRM_Utils_System_Base {
     }
 
     return array(
-      'url' => $userFrameworkResourceURL,
+      'url' => CRM_Utils_File::addTrailingSlash($userFrameworkResourceURL),
       'path' => CRM_Utils_File::addTrailingSlash($civicrm_root),
     );
   }

diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php
index b12205bab9e31b5f0a12125699be66d4fa87d348..aeab9544e228dcb4854833d1186afb85c91f8b17 100644 (file)
--- a/CRM/Utils/System/DrupalBase.php
+++ b/CRM/Utils/System/DrupalBase.php
@@ -160,10 +160,6 @@ abstract class CRM_Utils_System_DrupalBase extends CRM_Utils_System_Base {
       $fragment = '#' . $fragment;
     }
 
-    if (!isset($config->useFrameworkRelativeBase)) {
-      $base = parse_url($config->userFrameworkBaseURL);
-      $config->useFrameworkRelativeBase = $base['path'];
-    }
     $base = $absolute ? $config->userFrameworkBaseURL : $config->useFrameworkRelativeBase;
 
     $separator = $htmlize ? '&' : '&';

diff --git a/CRM/Utils/System/Joomla.php b/CRM/Utils/System/Joomla.php
index 0b7e13a351a3904a94742560fbc34edbeacc6b38..850d5c0fdc8bac229afdb9659fad0cbbd8a20bb5 100644 (file)
--- a/CRM/Utils/System/Joomla.php
+++ b/CRM/Utils/System/Joomla.php
@@ -272,10 +272,6 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base {
       $fragment = '#' . $fragment;
     }
 
-    if (!isset($config->useFrameworkRelativeBase)) {
-      $base = parse_url($config->userFrameworkBaseURL);
-      $config->useFrameworkRelativeBase = $base['path'];
-    }
     $base = $absolute ? $config->userFrameworkBaseURL : $config->useFrameworkRelativeBase;
 
     if (!empty($query)) {

diff --git a/CRM/Utils/System/WordPress.php b/CRM/Utils/System/WordPress.php
index 948ac735a9734e6d638b6f091f6fc0f0c4ff6be5..4f17c546481565ae099c6596d1925f395948455b 100644 (file)
--- a/CRM/Utils/System/WordPress.php
+++ b/CRM/Utils/System/WordPress.php
@@ -227,11 +227,6 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
   private function getBaseUrl($absolute, $frontend, $forceBackend) {
     $config = CRM_Core_Config::singleton();
 
-    if (!isset($config->useFrameworkRelativeBase)) {
-      $base = parse_url($config->userFrameworkBaseURL);
-      $config->useFrameworkRelativeBase = $base['path'];
-    }
-
     $base = $absolute ? $config->userFrameworkBaseURL : $config->useFrameworkRelativeBase;
 
     if ((is_admin() && !$frontend) || $forceBackend) {