From d0acc5782d84e793908738c1a438ab4f2a141ac6 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Tue, 10 Jun 2014 15:00:08 -0700 Subject: [PATCH] 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 --- includes/specials/SpecialUserlogin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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' ); -- 2.20.1