From: Kunal Mehta <legoktm@gmail.com>
Date: Tue, 10 Jun 2014 22:00:08 +0000 (-0700)
Subject: LoginForm: Pass username as first parameter to error message if aborted
X-Git-Tag: 1.31.0-rc.0~15407^2
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=d0acc5782d84e793908738c1a438ab4f2a141ac6;p=lhc%2Fweb%2Fwiklou.git

LoginForm: Pass username as first parameter to error message if aborted

If a hook is aborted, pass the username as the first parameter to allow
for more customized messages.

Change-Id: Ifb55a2e180c619f7d06f728dd8eea2c9863b8f82
---

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index bee94f8d35..dcc87a0a48 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -929,7 +929,8 @@ class LoginForm extends SpecialPage {
 				break;
 			case self::ABORTED:
 				$error = $this->mAbortLoginErrorMsg ?: 'login-abort-generic';
-				$this->mainLoginForm( $this->msg( $error )->text() );
+				$this->mainLoginForm( $this->msg( $error,
+						wfEscapeWikiText( $this->mUsername ) )->text() );
 				break;
 			default:
 				throw new MWException( 'Unhandled case value' );