From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 14 Jul 2015 18:13:01 +0000 (-0700)
Subject: Tweaked User::READ_LOCKING to use LOCK IN SHARE MODE
X-Git-Tag: 1.31.0-rc.0~10740^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=939dbec87add5b848371d3959d52a9bdf26a6186;p=lhc%2Fweb%2Fwiklou.git

Tweaked User::READ_LOCKING to use LOCK IN SHARE MODE

* This better alignes with IDBAccessObject docs and
  still locks out INSERTs

Change-Id: Ib8713938e0afa14bee6f90bc51d6331eaf356447
---

diff --git a/includes/User.php b/includes/User.php
index 95ac0f1ed1..339487db1e 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3721,15 +3721,13 @@ class User implements IDBAccessObject {
 			: wfGetDB( DB_SLAVE );
 
 		$options = ( ( $flags & self::READ_LOCKING ) == self::READ_LOCKING )
-			? array( 'FOR UPDATE' )
+			? array( 'LOCK IN SHARE MODE' )
 			: array();
 
-		$id = $db->selectField( 'user', 'user_id', array( 'user_name' => $s ), __METHOD__, $options );
-		if ( $id === false ) {
-			$id = 0;
-		}
+		$id = $db->selectField( 'user',
+			'user_id', array( 'user_name' => $s ), __METHOD__, $options );
 
-		return $id;
+		return (int)$id;
 	}
 
 	/**