Skip to content

Commit 8c89681

Browse files
committed
CRM-16421 CRM-17633 WIP Changes to support WP in it's own directory Replaced civicrm#103
1 parent 0daa53a commit 8c89681

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
@@ -1420,29 +1420,26 @@ public function clear_edit_post_menu_item() {
14201420
* @return mixed|null|string
14211421
*/
14221422
public function get_base_url($absolute, $frontend, $forceBackend) {
1423-
$config = CRM_Core_Config::singleton();
1424-
1425-
if (!isset($config->useFrameworkRelativeBase)) {
1426-
$base = parse_url($config->userFrameworkBaseURL);
1427-
$config->useFrameworkRelativeBase = $base['path'];
1423+
$config = CRM_Core_Config::singleton();
1424+
if (!defined('CIVICRM_UF_ADMINURL')) {
1425+
define('CIVICRM_UF_ADMINURL', CIVICRM_UF_BASEURL . 'wp-admin/');
1426+
}
1427+
if (!defined('CIVICRM_UF_WP_BASEURL')) {
1428+
define('CIVICRM_UF_WP_BASEURL', CIVICRM_UF_BASEURL );
14281429
}
1429-
1430-
$base = $absolute ? $config->userFrameworkBaseURL : $config->useFrameworkRelativeBase;
1431-
14321430
if ((is_admin() && !$frontend) || $forceBackend) {
1433-
$base .= admin_url( 'admin.php' );
1434-
return $base;
1431+
$url = CIVICRM_UF_ADMINURL . 'admin.php';
1432+
return $url;
14351433
}
14361434
elseif (defined('CIVICRM_UF_WP_BASEPAGE')) {
1437-
$base .= CIVICRM_UF_WP_BASEPAGE;
1438-
return $base;
1435+
$url = CIVICRM_UF_WP_BASEURL . CIVICRM_UF_WP_BASEPAGE ;
1436+
return $url;
14391437
}
14401438
elseif (isset($config->wpBasePage)) {
1441-
$base .= $config->wpBasePage;
1442-
return $base;
1439+
$url = CIVICRM_UF_WP_BASEURL . $config->wpBasePage;
1440+
return $url;
14431441
}
1444-
1445-
return $base;
1442+
return $absolute ? $url : preg_replace(';https?://[^/]+/;', '/', $url);
14461443
}
14471444

14481445

0 commit comments

Comments
 (0)