projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5786 from mallezie/crm-16283-duplicaterelationcheck
[civicrm-core.git]
/
CRM
/
Core
/
Payment.php
diff --git
a/CRM/Core/Payment.php
b/CRM/Core/Payment.php
index 2b665249af241e9c7c5d3ecfbc5b87835724720b..63c2ce9033cf3feb07c51cdb39f9451f54ca02c7 100644
(file)
--- a/
CRM/Core/Payment.php
+++ b/
CRM/Core/Payment.php
@@
-89,7
+89,7
@@
abstract class CRM_Core_Payment {
* @return CRM_Core_Payment
* @throws \CRM_Core_Exception
*/
* @return CRM_Core_Payment
* @throws \CRM_Core_Exception
*/
- public static function
&
singleton($mode = 'test', &$paymentProcessor, &$paymentForm = NULL, $force = FALSE) {
+ public static function singleton($mode = 'test', &$paymentProcessor, &$paymentForm = NULL, $force = FALSE) {
// make sure paymentProcessor is not empty
// CRM-7424
if (empty($paymentProcessor)) {
// make sure paymentProcessor is not empty
// CRM-7424
if (empty($paymentProcessor)) {
@@
-620,10
+620,7
@@
abstract class CRM_Core_Payment {
}
else {
// Legacy or extension as module instance
}
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);
}
$processorInstance = Civi\Payment\System::singleton()->getById($dao->processor_id);