CRM-15978 remove enotice introduced in last commit
authorEileen McNaughton <eileen@fuzion.co.nz>
Mon, 16 Feb 2015 12:54:09 +0000 (01:54 +1300)
committerEileen McNaughton <eileen@fuzion.co.nz>
Mon, 16 Feb 2015 12:54:09 +0000 (01:54 +1300)
CRM/Core/Payment.php

index d41af48100a39082f9e15db9cc7dd2adf1082988..60a6e3550934774222d075c3d6e269400f5ea86f 100644 (file)
@@ -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))