Skip to content

Commit 8347fbc

Browse files
kcristianobastienho
authored andcommitted
CRM-16421 CRM-17633 WIP Changes to support WP in it's own directory Replaced civicrm#103
1 parent 0e2f4d6 commit 8347fbc

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

civicrm.php

+13-16
Original file line numberDiff line numberDiff line change
@@ -1409,29 +1409,26 @@ public function clear_edit_post_menu_item() {
14091409
* @return mixed|null|string
14101410
*/
14111411
public function get_base_url($absolute, $frontend, $forceBackend) {
1412-
$config = CRM_Core_Config::singleton();
1413-
1414-
if (!isset($config->useFrameworkRelativeBase)) {
1415-
$base = parse_url($config->userFrameworkBaseURL);
1416-
$config->useFrameworkRelativeBase = $base['path'];
1412+
$config = CRM_Core_Config::singleton();
1413+
if (!defined('CIVICRM_UF_ADMINURL')) {
1414+
define('CIVICRM_UF_ADMINURL', CIVICRM_UF_BASEURL . 'wp-admin/');
1415+
}
1416+
if (!defined('CIVICRM_UF_WP_BASEURL')) {
1417+
define('CIVICRM_UF_WP_BASEURL', CIVICRM_UF_BASEURL );
14171418
}
1418-
1419-
$base = $absolute ? $config->userFrameworkBaseURL : $config->useFrameworkRelativeBase;
1420-
14211419
if ((is_admin() && !$frontend) || $forceBackend) {
1422-
$base .= admin_url( 'admin.php' );
1423-
return $base;
1420+
$url = CIVICRM_UF_ADMINURL . 'admin.php';
1421+
return $url;
14241422
}
14251423
elseif (defined('CIVICRM_UF_WP_BASEPAGE')) {
1426-
$base .= CIVICRM_UF_WP_BASEPAGE;
1427-
return $base;
1424+
$url = CIVICRM_UF_WP_BASEURL . CIVICRM_UF_WP_BASEPAGE ;
1425+
return $url;
14281426
}
14291427
elseif (isset($config->wpBasePage)) {
1430-
$base .= $config->wpBasePage;
1431-
return $base;
1428+
$url = CIVICRM_UF_WP_BASEURL . $config->wpBasePage;
1429+
return $url;
14321430
}
1433-
1434-
return $base;
1431+
return $absolute ? $url : preg_replace(';https?://[^/]+/;', '/', $url);
14351432
}
14361433

14371434

0 commit comments

Comments
 (0)