Skip to content

Commit

Permalink
Merge pull request #9324 from jmcclelland/crm-19569
Browse files Browse the repository at this point in the history
CRM-19569 - use relative links from info page to registration page.
  • Loading branch information
colemanw authored Oct 28, 2016
2 parents c838554 + 53c223b commit 88169e0
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions CRM/Event/Page/EventInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,14 @@ public function run() {
if ($action == CRM_Core_Action::PREVIEW) {
$mapURL = CRM_Utils_System::url('civicrm/contact/map/event',
"eid={$this->_id}&reset=1&action=preview",
TRUE, NULL, TRUE,
FALSE, NULL, TRUE,
TRUE
);
}
else {
$mapURL = CRM_Utils_System::url('civicrm/contact/map/event',
"eid={$this->_id}&reset=1",
TRUE, NULL, TRUE,
FALSE, NULL, TRUE,
TRUE
);
}
Expand All @@ -254,7 +254,7 @@ public function run() {
if ($participantListingID) {
$participantListingURL = CRM_Utils_System::url('civicrm/event/participant',
"reset=1&id={$this->_id}",
TRUE, NULL, TRUE, TRUE
FALSE, NULL, TRUE, TRUE
);
$this->assign('participantListingURL', $participantListingURL);
}
Expand All @@ -272,7 +272,7 @@ public function run() {
$action_query = $action === CRM_Core_Action::PREVIEW ? "&action=$action" : '';
$url = CRM_Utils_System::url('civicrm/event/register',
"id={$this->_id}&reset=1{$action_query}",
TRUE, NULL, TRUE,
FALSE, NULL, TRUE,
TRUE
);
if (!$eventFullMessage || $hasWaitingList) {
Expand All @@ -287,7 +287,7 @@ public function run() {
$link = CRM_Event_Cart_BAO_EventInCart::get_registration_link($this->_id);
$registerText = $link['label'];

$url = CRM_Utils_System::url($link['path'], $link['query'] . $action_query, TRUE, NULL, TRUE, TRUE);
$url = CRM_Utils_System::url($link['path'], $link['query'] . $action_query, FALSE, NULL, TRUE, TRUE);
}

//Fixed for CRM-4855
Expand Down

0 comments on commit 88169e0

Please sign in to comment.