X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FPayment%2FPayPalIPN.php;h=a506ab3f29714c9e737bfb09833608f1164b38f9;hb=f544b9a786aed47624d73299c32c1a504b52eac8;hp=d7a13692b65f29a8d05c2d5cc21780c9467f2c2c;hpb=4408637ca3ab242eac95bee2ad76b47248bf6746;p=civicrm-core.git diff --git a/CRM/Core/Payment/PayPalIPN.php b/CRM/Core/Payment/PayPalIPN.php index d7a13692b6..a506ab3f29 100644 --- a/CRM/Core/Payment/PayPalIPN.php +++ b/CRM/Core/Payment/PayPalIPN.php @@ -1,34 +1,18 @@ debug('PayPalIPN: Could not find txn_type in input request'); echo "Failure: Invalid parameters
"; return; } - if ($input['txnType'] == 'subscr_payment' && - $input['paymentStatus'] != 'Completed' + if ($input['txnType'] === 'subscr_payment' && + $input['paymentStatus'] !== 'Completed' ) { Civi::log()->debug('PayPalIPN: Ignore all IPN payments that are not completed'); - echo "Failure: Invalid parameters
"; + echo 'Failure: Invalid parameters
'; return; } @@ -336,7 +320,8 @@ class CRM_Core_Payment_PayPalIPN extends CRM_Core_Payment_BaseIPN { Civi::log()->debug('PayPalIPN: Received (ContactID: ' . $ids['contact'] . '; trxn_id: ' . $input['trxn_id'] . ').'); - if ($this->retrieve('membershipID', 'Integer', FALSE)) { + // Debugging related to possible missing membership linkage + if ($contributionRecurID && $this->retrieve('membershipID', 'Integer', FALSE)) { $templateContribution = CRM_Contribute_BAO_ContributionRecur::getTemplateContribution($contributionRecurID); $membershipPayment = civicrm_api3('MembershipPayment', 'get', [ 'contribution_id' => $templateContribution['id'],