Merge pull request #13563 from eileenmcnaughton/fn_fix_payment_by_type

[REF] Fix silly function to do less handling of non-existent scenarios

diff --cc CRM/Contribute/BAO/Contribution.php
index dc7a4f208f41552a06e6d8ea51b3d3b869d788b6,ff359e3ba3094667abd2c491dddcc1ecc6f8b272..8f61766b397ee0803a9d1cda7aa63f1471ce21f1
--- 1/CRM/Contribute/BAO/Contribution.php
--- 2/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@@ -4000,11 -4000,8 +4000,9 @@@ WHERE eft.financial_trxn_id IN ({$trxnI
     *
     * @return mixed
     */
 -  public static function getPaymentInfo($id, $component, $getTrxnInfo = FALSE, $usingLineTotal = FALSE) {
 +  public static function getPaymentInfo($id, $component = 'contribution', $getTrxnInfo = FALSE, $usingLineTotal = FALSE) {
 +    // @todo deprecate passing in component - always call with contribution.
      if ($component == 'event') {
-       $entity = 'participant';
-       $entityTable = 'civicrm_participant';
        $contributionId = CRM_Core_DAO::getFieldValue('CRM_Event_BAO_ParticipantPayment', $id, 'contribution_id', 'participant_id');
  
        if (!$contributionId) {

diff --cc CRM/Core/BAO/FinancialTrxn.php
Simple merge