Remove unused variables in completeOrder()
authorMatthew Wire (MJW Consulting) <mjw@mjwconsult.co.uk>
Wed, 13 Nov 2019 05:57:07 +0000 (18:57 +1300)
committerMatthew Wire (MJW Consulting) <mjw@mjwconsult.co.uk>
Tue, 19 Nov 2019 02:42:42 +0000 (15:42 +1300)
CRM/Contribute/BAO/Contribution.php

index 90d9a5415b83328605508a48e15f6f4ca8f1929b..f75880fcaf2910a84e97771577cd6e5bff90acf8 100644 (file)
@@ -4597,13 +4597,9 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
       $input['payment_processor'] = $paymentProcessorId;
     }
 
-    if (!empty($contribution->_relatedObjects['participant'])) {
-      $input['contribution_mode'] = 'participant';
-      $input['participant_id'] = $contribution->_relatedObjects['participant']->id;
-    }
-    elseif (!empty($contribution->_relatedObjects['membership'])) {
+    if (empty($contribution->_relatedObjects['participant']) && !empty($contribution->_relatedObjects['membership'])) {
+      // @fixme Can we remove this if altogether? - we removed the participant if / else and left relatedObjects['participant'] to ensure behaviour didn't change but it is probably not required.
       // @todo - use getRelatedMemberships instead
-      $input['contribution_mode'] = 'membership';
       $contribution->contribution_status_id = $contributionParams['contribution_status_id'];
       $contribution->trxn_id = CRM_Utils_Array::value('trxn_id', $input);
       $contribution->receive_date = CRM_Utils_Date::isoToMysql($contribution->receive_date);