* Add USER_BLOCKED case to UserLogin.

* Let Lockout extension use this case for a proper error message

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 5e8e3d8..59d584b 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -34,6 +34,7 @@ class LoginForm {
        const ABORTED = 8;
        const CREATE_BLOCKED = 9;
        const THROTTLED = 10;
+       const USER_BLOCKED = 11;
 
        var $mName, $mPassword, $mRetype, $mReturnTo, $mCookieCheck, $mPosted;
        var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
@@ -622,6 +623,9 @@ class LoginForm {
                        case self::THROTTLED:
                                $this->mainLoginForm( wfMsg( 'login-throttled' ) );
                                break;
+                       case self::USER_BLOCKED:
+                               $this->mainLoginForm( wfMsg( 'login-userblocked' ) );
+                               break;
                        default:
                                throw new MWException( "Unhandled case value" );
                }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 86b04b1..5b3e44c 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1076,6 +1076,7 @@ Check your spelling, or [[Special:UserLogin/signup|create a new account]].',
 'nosuchusershort'            => 'There is no user by the name "<nowiki>$1</nowiki>".
 Check your spelling.',
 'nouserspecified'            => 'You have to specify a username.',
+'login-userblocked'          => 'This user is blocked. Login not allowed.',
 'wrongpassword'              => 'Incorrect password entered.
 Please try again.',
 'wrongpasswordempty'         => 'Password entered was blank.

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 10d9b45..671c94f 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -434,6 +434,7 @@ $wgMessageStructure = array(
                'nosuchuser',
                'nosuchusershort',
                'nouserspecified',
+               'login-userblocked',
                'wrongpassword',
                'wrongpasswordempty',
                'passwordtooshort',