Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/263860

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(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EditAccount 
refs/changes/60/263860/1

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: newchange
Gerrit-Change-Id: I2842c3930d1c32c9c4db918815a95bebd7663a41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EditAccount
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to