From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 14 Jul 2016 03:45:20 +0000 (-0700)
Subject: Use proper SELECT options in User::idFromName() for locking
X-Git-Tag: 1.31.0-rc.0~6368
X-Git-Url: http://git.cyclocoop.org/data/modifier.php?a=commitdiff_plain;h=86df9301a98396095fa19277d1f3a8ceff3947e1;p=lhc%2Fweb%2Fwiklou.git

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