From c3f8b8a6426157de507a13edc2bde8b456d32609 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@tadpole.cc>
Date: Tue, 7 Jun 2016 17:16:35 -0600
Subject: [PATCH 1/2] CRM-17633 Changes to accomadate WP in it's own directory

---
 civicrm.php | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/civicrm.php b/civicrm.php
index cc90caa..e889393 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -1420,29 +1420,26 @@ public function clear_edit_post_menu_item() {
    * @return mixed|null|string
    */
   public function get_base_url($absolute, $frontend, $forceBackend) {
-    $config    = CRM_Core_Config::singleton();
-
-    if (!isset($config->useFrameworkRelativeBase)) {
-      $base = parse_url($config->userFrameworkBaseURL);
-      $config->useFrameworkRelativeBase = $base['path'];
+    $config = CRM_Core_Config::singleton();
+    if (!defined('CIVICRM_UF_ADMINURL')) {
+      define('CIVICRM_UF_ADMINURL', CIVICRM_UF_BASEURL . '/wp-admin/');
+    }
+    if (!defined('CIVICRM_UF_WP_BASEURL')) {
+      define('CIVICRM_UF_WP_BASEURL', CIVICRM_UF_BASEURL );
     }
-
-    $base = $absolute ? $config->userFrameworkBaseURL : $config->useFrameworkRelativeBase;
-
     if ((is_admin() && !$frontend) || $forceBackend) {
-      $base .= admin_url( 'admin.php' );
-      return $base;
+      $url = CIVICRM_UF_ADMINURL . 'admin.php';
+      return $url;
     }
     elseif (defined('CIVICRM_UF_WP_BASEPAGE')) {
-      $base .= CIVICRM_UF_WP_BASEPAGE;
-      return $base;
+      $url = CIVICRM_UF_WP_BASEURL  . CIVICRM_UF_WP_BASEPAGE  ;
+      return $url;
     }
     elseif (isset($config->wpBasePage)) {
-      $base .= $config->wpBasePage;
-      return $base;
+      $url = CIVICRM_UF_WP_BASEURL  . $config->wpBasePage;
+      return $url;
     }
-
-    return $base;
+    return $absolute ? $url :  preg_replace(';https?://[^/]+/;', '/', $url);
   }
 
 

From 1a0495d0ab2222ef3968a5beddc8311691a8f597 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@tadpole.cc>
Date: Tue, 7 Jun 2016 17:49:38 -0600
Subject: [PATCH 2/2] CRM-17633 remove leading slash from wp-admin as
 CIVICRM_UF_BASEURL as documented should have a trailing slash

---
 civicrm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/civicrm.php b/civicrm.php
index e889393..bd2ba68 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -1422,7 +1422,7 @@ public function clear_edit_post_menu_item() {
   public function get_base_url($absolute, $frontend, $forceBackend) {
     $config = CRM_Core_Config::singleton();
     if (!defined('CIVICRM_UF_ADMINURL')) {
-      define('CIVICRM_UF_ADMINURL', CIVICRM_UF_BASEURL . '/wp-admin/');
+      define('CIVICRM_UF_ADMINURL', CIVICRM_UF_BASEURL . 'wp-admin/');
     }
     if (!defined('CIVICRM_UF_WP_BASEURL')) {
       define('CIVICRM_UF_WP_BASEURL', CIVICRM_UF_BASEURL );