Update wp.frontend and wp.backend to account for cases where CIVICRM_UF_BASEURL may...

diff --git a/Civi/Core/Paths.php b/Civi/Core/Paths.php
index cc8311e5b724f58e92058a931ba85f99e58737db..8cab188a59f99aac1beb252e5956ac1721c200fd 100644 (file)
--- 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(