From f5dd9d4ac461afe432ce5b2ccf324c2125597cad Mon Sep 17 00:00:00 2001 From: Kevin Cristiano Date: Tue, 10 Oct 2017 16:57:55 -0400 Subject: [PATCH] Update wp.frontend and wp.backend to account for cases where CIVICRM_UF_BASEURL may or may not have a trailing slash --- Civi/Core/Paths.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Civi/Core/Paths.php b/Civi/Core/Paths.php index cc8311e5b7..8cab188a59 100644 --- a/Civi/Core/Paths.php +++ b/Civi/Core/Paths.php @@ -57,7 +57,7 @@ class Paths { return \CRM_Core_Config::singleton()->userSystem->getDefaultFileStorage(); }) ->register('wp.frontend.base', function () { - return array('url' => CIVICRM_UF_BASEURL . '/'); + return array('url' => rtrim(CIVICRM_UF_BASEURL, '/') . '/'); }) ->register('wp.frontend', function () use ($paths) { $config = \CRM_Core_Config::singleton(); @@ -67,7 +67,7 @@ class Paths { ); }) ->register('wp.backend.base', function () { - return array('url' => CIVICRM_UF_BASEURL . '/wp-admin/'); + return array('url' => rtrim(CIVICRM_UF_BASEURL, '/') . '/wp-admin/'); }) ->register('wp.backend', function () use ($paths) { return array( -- 2.25.1