Billing Name saved as Participant Name Fix

diff --git a/CRM/Event/Form/Registration/AdditionalParticipant.php b/CRM/Event/Form/Registration/AdditionalParticipant.php
index bc4a6148c8736926e4c0ef01cd3d8a789b20ad0e..df561596a82dd1097fb9ba628838944d826080d3 100644 (file)
--- a/CRM/Event/Form/Registration/AdditionalParticipant.php
+++ b/CRM/Event/Form/Registration/AdditionalParticipant.php
@@ -191,7 +191,7 @@ class CRM_Event_Form_Registration_AdditionalParticipant extends CRM_Event_Form_R
       }
       foreach (array(
         'first_name', 'last_name') as $name) {
-        if (!empty($$keys[$name]) &&
+        if (array_key_exists($name, $$keys) &&
           CRM_Utils_Array::value('is_required', CRM_Utils_Array::value($name, $$keys))
         ) {
           $$name = 1;

diff --git a/CRM/Event/Form/Registration/Confirm.php b/CRM/Event/Form/Registration/Confirm.php
index 1a25aa1ed0af299110e3077d01b632ca2bc95955..4d6ca14f2eee80fc5cb5f9ee7165363bea0d57f2 100644 (file)
--- a/CRM/Event/Form/Registration/Confirm.php
+++ b/CRM/Event/Form/Registration/Confirm.php
@@ -1089,14 +1089,6 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration {
    * @param $form
    */
   public static function assignProfiles(&$form) {
-    $addParticipantProfile = $form->get('addParticipantProfile');
-    $primaryParticipantProfile = $form->get('primaryParticipantProfile');
-    if (!empty($addParticipantProfile) || !empty($primaryParticipantProfile)) {
-      $form->assign('addParticipantProfile', $addParticipantProfile);
-      $form->assign('primaryParticipantProfile', $primaryParticipantProfile);
-      return;
-    }
-
     $participantParams = $form->_params;
     $formattedValues = $profileFields = array();
     $count             = 1;