Use proper SELECT options in User::idFromName() for locking

Change-Id: Ia3ec245ecf5bb2fe7996828696b09f12a8ce10e1

diff --git a/includes/user/User.php b/includes/user/User.php
index 4a92f65..a774aba 100644 (file)
--- 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 ) {