From 939dbec87add5b848371d3959d52a9bdf26a6186 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 14 Jul 2015 11:13:01 -0700 Subject: [PATCH] Tweaked User::READ_LOCKING to use LOCK IN SHARE MODE * This better alignes with IDBAccessObject docs and still locks out INSERTs Change-Id: Ib8713938e0afa14bee6f90bc51d6331eaf356447 --- includes/User.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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; } /** -- 2.20.1