From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Mon, 16 Feb 2015 12:54:09 +0000 (+1300)
Subject: CRM-15978 remove enotice introduced in last commit
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=81ebda7b3f14105c999036936cf9fd150579c7b6;p=civicrm-core.git

CRM-15978 remove enotice introduced in last commit
---

diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
index d41af48100..60a6e35509 100644
--- a/CRM/Core/Payment.php
+++ b/CRM/Core/Payment.php
@@ -589,16 +589,13 @@ abstract class CRM_Core_Payment {
         }
       }
 
-      $paymentProcessor = CRM_Financial_BAO_PaymentProcessor::getPayment($dao->processor_id, $mode);
+      $processorInstance = $processorInstance = Civi\Payment\System::singleton()->getById($dao->processor_id);
 
       // Should never be empty - we already established this processor_id exists and is active.
-      if (empty($paymentProcessor)) {
+      if (empty($processorInstance)) {
         continue;
       }
 
-      // Instantiate PP
-      $processorInstance = new $paymentClass($mode, $paymentProcessor);
-
       // Does PP implement this method, and can we call it?
       if (!method_exists($processorInstance, $method) ||
         !is_callable(array($processorInstance, $method))