From: kurund <kurund@civicrm.org>
Date: Tue, 14 Apr 2015 23:39:49 +0000 (-0700)
Subject: CRM-15959, manually applied changes that were lost in forward merge
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=25ce8d1359267894ed06b7ccbba405130bfe3021;p=civicrm-core.git

CRM-15959, manually applied changes that were lost in forward merge

----------------------------------------
* CRM-15959: Leakage in payment processor selection
  https://issues.civicrm.org/jira/browse/CRM-15959
---

diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
index 2b665249af..81774bdfc2 100644
--- a/CRM/Core/Payment.php
+++ b/CRM/Core/Payment.php
@@ -620,10 +620,7 @@ abstract class CRM_Core_Payment {
       }
       else {
         // Legacy or extension as module instance
-        if (empty($paymentClass)) {
-          $paymentClass = 'CRM_Core_' . $dao->class_name;
-
-        }
+        $paymentClass = 'CRM_Core_' . $dao->class_name;
       }
 
       $processorInstance = Civi\Payment\System::singleton()->getById($dao->processor_id);