From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 24 Nov 2020 01:04:34 +0000 (+1300)
Subject: dev/financial#148 fold call to loadObjects
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3868d6af485eca5008269ebc4158142646d5355f;p=civicrm-core.git

dev/financial#148 fold call to loadObjects
---

diff --git a/CRM/Core/Payment/AuthorizeNetIPN.php b/CRM/Core/Payment/AuthorizeNetIPN.php
index 607fcc1fec..6971fffc21 100644
--- a/CRM/Core/Payment/AuthorizeNetIPN.php
+++ b/CRM/Core/Payment/AuthorizeNetIPN.php
@@ -86,7 +86,13 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN {
       $objects['contact'] = &$contact;
       $objects['contribution'] = &$contribution;
 
-      $this->loadObjects($input, $ids, $objects, TRUE, $paymentProcessorID);
+      $contribution = &$objects['contribution'];
+      $ids['paymentProcessor'] = $paymentProcessorID;
+      $contribution->loadRelatedObjects($input, $ids);
+      if (empty($contribution->_relatedObjects['paymentProcessor'])) {
+        throw new CRM_Core_Exception("Could not find payment processor for contribution record: " . $contribution->id);
+      }
+      $objects = array_merge($objects, $contribution->_relatedObjects);
 
       // check if first contribution is completed, else complete first contribution
       $first = TRUE;