From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Mon, 17 Aug 2015 15:01:49 +0000 (-0400)
Subject: Rename variable to avoid collisions
X-Git-Tag: 1.31.0-rc.0~10402
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=be78b9759b141a5b26b3e6932cd353b6b463b27f;p=lhc%2Fweb%2Fwiklou.git

Rename variable to avoid collisions

The overwriting of $status in one switch case looks like a likely cause
of T109193, so let's rename one of the two.

Bug: T109193
Change-Id: I373f0e01d349883c7735c8e6acf9d258900c166e
---

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 0b500f4752..13957c32eb 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -939,8 +939,8 @@ class LoginForm extends SpecialPage {
 		global $wgMemc, $wgLang, $wgSecureLogin, $wgPasswordAttemptThrottle,
 			$wgInvalidPasswordReset;
 
-		$status = $this->authenticateUserData();
-		switch ( $status ) {
+		$authRes = $this->authenticateUserData();
+		switch ( $authRes ) {
 			case self::SUCCESS:
 				# We've verified now, update the real record
 				$user = $this->getUser();
@@ -1066,8 +1066,8 @@ class LoginForm extends SpecialPage {
 
 		LoggerFactory::getInstance( 'authmanager' )->info( 'Login attempt', array(
 			'event' => 'login',
-			'successful' => $status === self::SUCCESS,
-			'status' => LoginForm::$statusCodes[$status],
+			'successful' => $authRes === self::SUCCESS,
+			'status' => LoginForm::$statusCodes[$authRes],
 		) );
 	}