diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index afa12a018e6..c156a5d289e 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -1374,7 +1374,6 @@ class LoginForm extends SpecialPage { $template->set( 'cansecurelogin', ( $wgSecureLogin === true ) ); $template->set( 'stickhttps', (int)$this->mStickHTTPS ); $template->set( 'loggedin', $user->isLoggedIn() ); - $template->set( 'loggedinuser', $user->getName() ); if ( $this->mType == 'signup' ) { if ( !self::getCreateaccountToken() ) { diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php index 8bba4265f01..ad019058ec8 100644 --- a/includes/templates/Userlogin.php +++ b/includes/templates/Userlogin.php @@ -37,11 +37,6 @@ class UserloginTemplate extends BaseTemplate {
- data['loggedin'] ) { ?> -
- getMsg( 'userlogin-loggedin' )->params( $this->data['loggedinuser'] )->parse(); ?> -
-
html( 'header' ); /* extensions such as ConfirmEdit add form HTML here */ ?>
@@ -171,15 +166,9 @@ class UserloginTemplate extends BaseTemplate {
haveData( 'createOrLoginHref' ) ) { ?> - data['loggedin'] ) { ?> -
- msg( 'userlogin-createanother' ); ?> -
- -
- msg( 'userlogin-noaccount' ); ?>msg( 'userlogin-joinproject' ); ?> -
- +
+ msg( 'userlogin-noaccount' ); ?>msg( 'userlogin-joinproject' ); ?> +
haveData( 'uselang' ) ) { ?> haveData( 'token' ) ) { ?> diff --git a/languages/i18n/en.json b/languages/i18n/en.json index e1603275955..d6d22ffacb0 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -406,8 +406,6 @@ "userlogin-resetpassword-link": "Forgot your password?", "helplogin-url": "https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Logging_in", "userlogin-helplink2": "Help with logging in", - "userlogin-loggedin": "You are already logged in as {{GENDER:$1|$1}}.\nUse the form below to log in as another user.", - "userlogin-createanother": "Create another account", "createacct-emailrequired": "Email address", "createacct-emailoptional": "Email address (optional)", "createacct-email-ph": "Enter your email address", diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.login.css b/resources/src/mediawiki.special/mediawiki.special.userlogin.login.css index 64471b2733b..ee6a57c1d41 100644 --- a/resources/src/mediawiki.special/mediawiki.special.userlogin.login.css +++ b/resources/src/mediawiki.special/mediawiki.special.userlogin.login.css @@ -6,10 +6,6 @@ background: url(images/glyph-people-large.png) no-repeat 50%; margin: 0 auto; padding-top: 4em; -} - -#mw-createaccount-cta, -#mw-createaccount-another { font-size: 0.9em; font-weight: normal; text-align: center;