jenkins-bot has submitted this change and it was merged.
Change subject: Convert code to using startAtomic()/endAtomic()
......................................................................
Convert code to using startAtomic()/endAtomic()
Bug: T120791
Change-Id: I2842c3930d1c32c9c4db918815a95bebd7663a41
---
M SpecialEditAccount_body.php
1 file changed, 4 insertions(+), 10 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialEditAccount_body.php b/SpecialEditAccount_body.php
index 5d3133f..09e0dbc 100644
--- a/SpecialEditAccount_body.php
+++ b/SpecialEditAccount_body.php
@@ -492,7 +492,7 @@
if ( class_exists( 'GlobalPreferences' ) ) {
$dbw = GlobalPreferences::getPrefsDB( DB_MASTER );
- $dbw->begin( __METHOD__ );
+ $dbw->startAtomic( __METHOD__ );
$dbw->delete(
'global_preferences',
array(
@@ -502,9 +502,6 @@
),
__METHOD__
);
- $dbw->commit( __METHOD__ );
-
- $dbw->begin( __METHOD__ );
$dbw->delete(
'global_preferences',
array(
@@ -513,7 +510,7 @@
),
__METHOD__
);
- $dbw->commit( __METHOD__ );
+ $dbw->endAtomic( __METHOD__ );
}
// ShoutWiki patch end
@@ -687,7 +684,7 @@
}
$dbw = GlobalPreferences::getPrefsDB( DB_MASTER );
- $dbw->begin( __METHOD__ );
+ $dbw->startAtomic( __METHOD__ );
$dbw->insert(
'global_preferences',
array(
@@ -697,9 +694,6 @@
),
__METHOD__
);
- $dbw->commit( __METHOD__ );
-
- $dbw->begin( __METHOD__ );
$dbw->insert(
'global_preferences',
array(
@@ -709,7 +703,7 @@
),
__METHOD__
);
- $dbw->commit( __METHOD__ );
+ $dbw->endAtomic( __METHOD__ );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/263860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2842c3930d1c32c9c4db918815a95bebd7663a41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EditAccount
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
