From 2c0f140455f1ceb506996b680fae6c502c2f03fe Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 11 Sep 2015 01:15:01 -0700 Subject: [PATCH] CRM_Utils_System - Cleanup useFrameworkRelativeBase --- CRM/Utils/System/Base.php | 2 +- CRM/Utils/System/DrupalBase.php | 4 ---- CRM/Utils/System/Joomla.php | 4 ---- CRM/Utils/System/WordPress.php | 5 ----- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php index 10bbb91370..1fd5424126 100644 --- 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 b12205bab9..aeab9544e2 100644 --- 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 0b7e13a351..850d5c0fdc 100644 --- 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 948ac735a9..4f17c54648 100644 --- 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) { -- 2.25.1