From: Jamie McClelland Date: Wed, 26 Oct 2016 16:54:09 +0000 (-0400) Subject: CRM-19569 - use relative links from info page to registration page. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=53c223bff85ee19c00cadfc30289c15fe19db0d4;p=civicrm-core.git CRM-19569 - use relative links from info page to registration page. --- diff --git a/CRM/Event/Page/EventInfo.php b/CRM/Event/Page/EventInfo.php index 66c96ebb20..7b4d109771 100644 --- a/CRM/Event/Page/EventInfo.php +++ b/CRM/Event/Page/EventInfo.php @@ -226,14 +226,14 @@ class CRM_Event_Page_EventInfo extends CRM_Core_Page { 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 ); } @@ -254,7 +254,7 @@ class CRM_Event_Page_EventInfo extends CRM_Core_Page { 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); } @@ -272,7 +272,7 @@ class CRM_Event_Page_EventInfo extends CRM_Core_Page { $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) { @@ -287,7 +287,7 @@ class CRM_Event_Page_EventInfo extends CRM_Core_Page { $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