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 2b665249af241e9c7c5d3ecfbc5b87835724720b..81774bdfc2eb13f335d418ab8f53458d7ad4560d 100644 (file)
--- 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);