From 86df9301a98396095fa19277d1f3a8ceff3947e1 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 13 Jul 2016 20:45:20 -0700 Subject: [PATCH] Use proper SELECT options in User::idFromName() for locking Change-Id: Ia3ec245ecf5bb2fe7996828696b09f12a8ce10e1 --- includes/user/User.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/user/User.php b/includes/user/User.php index 4a92f6586e..a774aba4d9 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -772,15 +772,15 @@ class User implements IDBAccessObject { return self::$idCacheByName[$name]; } - $db = ( $flags & self::READ_LATEST ) - ? wfGetDB( DB_MASTER ) - : wfGetDB( DB_SLAVE ); + list( $index, $options ) = DBAccessObjectUtils::getDBOptions( $flags ); + $db = wfGetDB( $index ); $s = $db->selectRow( 'user', [ 'user_id' ], [ 'user_name' => $nt->getText() ], - __METHOD__ + __METHOD__, + $options ); if ( $s === false ) { -- 2.20.1