Update wp.frontend and wp.backend to account for cases where CIVICRM_…

…UF_BASEURL may or may not have a trailing slash
civicrm · Oct 10, 2017 · 3c88727 · 3c88727
1 parent 6736b6f
commit 3c88727
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Civi/Core/Paths.php b/Civi/Core/Paths.php
@@ -57,7 +57,7 @@ public function __construct() {
         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 @@ public function __construct() {
         );
       })
       ->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(