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 #18020 from eileenmcnaughton/pptrans
[civicrm-core.git]
/
CRM
/
Core
/
Payment
/
BaseIPN.php
diff --git
a/CRM/Core/Payment/BaseIPN.php
b/CRM/Core/Payment/BaseIPN.php
index 82ae385852bc81d6843d17aa02794e7999d6b872..8b2d72ba52f4c17ad2dba5ea78afa17ae0420423 100644
(file)
--- a/
CRM/Core/Payment/BaseIPN.php
+++ b/
CRM/Core/Payment/BaseIPN.php
@@
-214,7
+214,7
@@
class CRM_Core_Payment_BaseIPN {
* @return bool
* @throws \CiviCRM_API3_Exception
*/
* @return bool
* @throws \CiviCRM_API3_Exception
*/
- public function failed(&$objects,
&$transaction
, $input = []) {
+ public function failed(&$objects,
$transaction = NULL
, $input = []) {
$contribution = &$objects['contribution'];
$memberships = [];
if (!empty($objects['membership'])) {
$contribution = &$objects['contribution'];
$memberships = [];
if (!empty($objects['membership'])) {
@@
-266,7
+266,9
@@
class CRM_Core_Payment_BaseIPN {
}
}
}
}
- $transaction->commit();
+ if ($transaction) {
+ $transaction->commit();
+ }
Civi::log()->debug("Setting contribution status to Failed");
return TRUE;
}
Civi::log()->debug("Setting contribution status to Failed");
return TRUE;
}
@@
-299,7
+301,7
@@
class CRM_Core_Payment_BaseIPN {
* @return bool
* @throws \CiviCRM_API3_Exception
*/
* @return bool
* @throws \CiviCRM_API3_Exception
*/
- public function cancelled(&$objects,
&$transaction
, $input = []) {
+ public function cancelled(&$objects,
$transaction = NULL
, $input = []) {
$contribution = &$objects['contribution'];
$memberships = [];
if (!empty($objects['membership'])) {
$contribution = &$objects['contribution'];
$memberships = [];
if (!empty($objects['membership'])) {
@@
-353,7
+355,9
@@
class CRM_Core_Payment_BaseIPN {
$this->cancelParticipant($participant->id);
}
}
$this->cancelParticipant($participant->id);
}
}
- $transaction->commit();
+ if ($transaction) {
+ $transaction->commit();
+ }
Civi::log()->debug("Setting contribution status to Cancelled");
return TRUE;
}
Civi::log()->debug("Setting contribution status to Cancelled");
return TRUE;
}