projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #15803 from eileenmcnaughton/participant
[civicrm-core.git]
/
CRM
/
Event
/
Page
/
EventInfo.php
diff --git
a/CRM/Event/Page/EventInfo.php
b/CRM/Event/Page/EventInfo.php
index 6cdcab5bdddce18675ef83e893c642c4bda15369..8121be23a7fcaaeaa4d69af8ae6c90d7af0eee64 100644
(file)
--- a/
CRM/Event/Page/EventInfo.php
+++ b/
CRM/Event/Page/EventInfo.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-20
19
|
+ | Copyright CiviCRM LLC (c) 2004-20
20
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-20
19
+ * @copyright CiviCRM LLC (c) 2004-20
20
*/
/**
*/
/**
@@
-75,7
+75,6
@@
class CRM_Event_Page_EventInfo extends CRM_Core_Page {
CRM_Event_BAO_Event::retrieve($params, $values['event']);
if (!$values['event']['is_active']) {
CRM_Event_BAO_Event::retrieve($params, $values['event']);
if (!$values['event']['is_active']) {
- // form is inactive, die a fatal death
CRM_Utils_System::setUFMessage(ts('The event you requested is currently unavailable (contact the site administrator for assistance).'));
return CRM_Utils_System::permissionDenied();
}
CRM_Utils_System::setUFMessage(ts('The event you requested is currently unavailable (contact the site administrator for assistance).'));
return CRM_Utils_System::permissionDenied();
}
@@
-86,7
+85,7
@@
class CRM_Event_Page_EventInfo extends CRM_Core_Page {
if (!empty($values['event']['is_template'])) {
// form is an Event Template
if (!empty($values['event']['is_template'])) {
// form is an Event Template
- CRM_Core_Error::
fatal
(ts('The page you requested is currently unavailable.'));
+ CRM_Core_Error::
statusBounce
(ts('The page you requested is currently unavailable.'));
}
// Add Event Type to $values in case folks want to display it
}
// Add Event Type to $values in case folks want to display it
@@
-96,12
+95,7
@@
class CRM_Event_Page_EventInfo extends CRM_Core_Page {
// show event fees.
if ($this->_id && !empty($values['event']['is_monetary'])) {
// show event fees.
if ($this->_id && !empty($values['event']['is_monetary'])) {
- //CRM-6907
- $config = CRM_Core_Config::singleton();
- $config->defaultCurrency = CRM_Utils_Array::value('currency',
- $values['event'],
- $config->defaultCurrency
- );
+ CRM_Contribute_BAO_Contribution_Utils::overrideDefaultCurrency($values['event']);
//CRM-10434
$discountId = CRM_Core_BAO_Discount::findSet($this->_id, 'civicrm_event');
//CRM-10434
$discountId = CRM_Core_BAO_Discount::findSet($this->_id, 'civicrm_event');