Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-04-18-48-05

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

diff --git a/CRM/Event/Form/Registration/AdditionalParticipant.php b/CRM/Event/Form/Registration/AdditionalParticipant.php
index 0c7287047adc57ad497acb7a406adb308af35796..097e7aaacb6630eba9f20110ed83b80439a9a678 100644 (file)
--- a/CRM/Event/Form/Registration/AdditionalParticipant.php
+++ b/CRM/Event/Form/Registration/AdditionalParticipant.php
@@ -564,7 +564,7 @@ class CRM_Event_Form_Registration_AdditionalParticipant extends CRM_Event_Form_R
     CRM_Core_Form::validateMandatoryFields($self->_fields, $fields, $errors);
 
     // validate supplied payment instrument values (e.g. credit card number and cvv)
-    $payment_processor_id = $self->params[0]['payment_processor_id'];
+    $payment_processor_id = $self->_params[0]['payment_processor'];
     CRM_Core_Payment_Form::validatePaymentInstrument($payment_processor_id, $self->_params[0], $errors, $self);
 
     if (!empty($errors)) {
@@ -579,6 +579,7 @@ class CRM_Event_Form_Registration_AdditionalParticipant extends CRM_Event_Form_R
         }
       }
     }
+    return TRUE;
   }
 
   /**
@@ -767,4 +768,5 @@ class CRM_Event_Form_Registration_AdditionalParticipant extends CRM_Event_Form_R
     }
     return FALSE;
   }
+
 }