Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232046
Change subject: Rename variable to avoid collisions
......................................................................
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
---
M includes/specials/SpecialUserlogin.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/46/232046/1
diff --git a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
index 0b500f4..13957c3 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -939,8 +939,8 @@
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 @@
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],
) );
}
--
To view, visit https://gerrit.wikimedia.org/r/232046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I373f0e01d349883c7735c8e6acf9d258900c166e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
