Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-14-11-24-52

[civicrm-core.git] / CRM / Event / Form / Participant.php

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index cc6e524cd0b5a1342d075ae8fd78a14b36d2edff..3cad98f2adccb80f615021dc93c27acc66e0dfd6 100644 (file)
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -1287,6 +1287,10 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
           $this->_params['role_id']
         );
       }
+      
+      //CRM-15372 patch to fix fee amount replacing amount
+      $this->_params['fee_amount'] =  $this->_params['amount'];
+
       $participants[] = CRM_Event_Form_Registration::addParticipant($this, $contactID);
 
       //add custom data for participant