From aa9bbc47c3b043479aba45ab8e76b663826b780f Mon Sep 17 00:00:00 2001 From: "Alexia E. Smith" Date: Fri, 14 Jun 2019 12:40:54 -0500 Subject: [PATCH] user: Move idFromName cache truncation to before adding the new value This prevents a double query for the same User::idFromName() call twice in a row. Bug: T225843 Change-Id: I5beb0a3ad5e715b68dd8a450408fb089184fa6ce --- includes/user/User.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/user/User.php b/includes/user/User.php index e5dfcebe5e..2de90edb4b 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -950,12 +950,12 @@ class User implements IDBAccessObject, UserIdentity { $result = (int)$s->user_id; } - self::$idCacheByName[$name] = $result; - - if ( count( self::$idCacheByName ) > 1000 ) { + if ( count( self::$idCacheByName ) >= 1000 ) { self::$idCacheByName = []; } + self::$idCacheByName[$name] = $result; + return $result; } -- 2.20.1