From: Ori Livneh <ori@wikimedia.org>
Date: Tue, 18 Nov 2014 22:42:18 +0000 (-0800)
Subject: Follow-up to I05aacd30b: normalize case in User::idFromName
X-Git-Tag: 1.31.0-rc.0~13252^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/message.php?a=commitdiff_plain;h=fc8159e4de5baf6feb8b3f27f02b4659016193a1;p=lhc%2Fweb%2Fwiklou.git

Follow-up to I05aacd30b: normalize case in User::idFromName

Change-Id: Ibeef04093338bfef8e65f40b1f9db588c8d5a79d
---

diff --git a/includes/User.php b/includes/User.php
index f9f4b6a4bb..feaf3647b3 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -565,14 +565,15 @@ class User implements IDBAccessObject {
 	 * @return int|null The corresponding user's ID, or null if user is nonexistent
 	 */
 	public static function idFromName( $name ) {
-		// We don't want to call Title::makeTitleSafe yet, since that call path
-		// ends up needing the user language, which ends up trying to load the
-		// user object, which ends up back here (bug 54193).
-		$nt = Title::makeTitle( NS_USER, $name );
 		if ( isset( self::$idCacheByName[$name] ) ) {
 			return self::$idCacheByName[$name];
 		}
 
+		// We don't want to call Title::makeTitleSafe yet, since that call path
+		// ends up needing the user language, which ends up trying to load the
+		// user object, which ends up back here (bug 54193).
+		$nt = Title::makeTitle( NS_USER, Title::capitalize( $name, NS_USER ) );
+
 		$dbr = wfGetDB( DB_SLAVE );
 		$s = $dbr->selectRow(
 			'user',