Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-16421 CRM-17633 WIP Changes to support WP in it's own directory #103

Closed
wants to merge 3 commits into from
Closed

CRM-16421 CRM-17633 WIP Changes to support WP in it's own directory #103

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3f8b8a
CRM-17633 Changes to accomadate WP in it's own directory
kcristiano Jun 7, 2016
1a0495d
CRM-17633 remove leading slash from wp-admin as CIVICRM_UF_BASEURL as…
kcristiano Jun 7, 2016
473e034
Merge pull request #1 from kcristiano/master
kcristiano Sep 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions civicrm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}


Expand Down