Adamw has submitted this change and it was merged.
Change subject: Overlooked a nonexistent variable reference
......................................................................
Overlooked a nonexistent variable reference
Followup to Iafc6fcaec8aadeb81edc1fd3a4b815f4f2acb232
Change-Id: I2157369cbbb5fa80614c900082eed9a0c779730a
---
M sites/all/modules/wmf_common/Queue.php
1 file changed, 4 insertions(+), 6 deletions(-)
Approvals:
Adamw: Verified; Looks good to me, approved
diff --git a/sites/all/modules/wmf_common/Queue.php
b/sites/all/modules/wmf_common/Queue.php
index 2741008..21b9c27 100644
--- a/sites/all/modules/wmf_common/Queue.php
+++ b/sites/all/modules/wmf_common/Queue.php
@@ -174,12 +174,10 @@
}
catch ( Exception $ex ) {
watchdog( 'wmf_common', "Aborting DB transaction.", NULL,
WATCHDOG_INFO );
- if ( $transactional ) {
- $native_civi_transaction->rollback();
- $crm_transaction->rollback();
- $ct_transaction->rollback();
- $drupal_transaction->rollback();
- }
+ $native_civi_transaction->rollback();
+ $crm_transaction->rollback();
+ $ct_transaction->rollback();
+ $drupal_transaction->rollback();
throw $ex;
}
--
To view, visit https://gerrit.wikimedia.org/r/110905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2157369cbbb5fa80614c900082eed9a0c779730a
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Adamw <[email protected]>
Gerrit-Reviewer: Adamw <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
