Merge "Fix sessionfailure i18n message during authentication"

[lhc/web/wiklou.git] / includes / specialpage / AuthManagerSpecialPage.php

diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php
index 500c2e9..b9745de 100644 (file)
--- a/includes/specialpage/AuthManagerSpecialPage.php
+++ b/includes/specialpage/AuthManagerSpecialPage.php
@@ -609,7 +609,7 @@ abstract class AuthManagerSpecialPage extends SpecialPage {
                        } elseif ( array_key_exists( 'type', $definition ) ) {
                                $class = HTMLForm::$typeMappings[$definition['type']];
                        }
-                       if ( $class !== 'HTMLInfoField' ) {
+                       if ( $class !== HTMLInfoField::class ) {
                                $definition['tabindex'] = $i;
                                $i++;
                        }
@@ -679,7 +679,7 @@ abstract class AuthManagerSpecialPage extends SpecialPage {
                ];
 
                if ( $type === 'submit' && isset( $singleFieldInfo['label'] ) ) {
-                       $descriptor['default'] = wfMessage( $singleFieldInfo['label'] )->plain();
+                       $descriptor['default'] = $singleFieldInfo['label']->plain();
                } elseif ( $type !== 'submit' ) {
                        $descriptor += array_filter( [
                                // help-message is omitted as it is usually not really useful for a web interface
@@ -688,7 +688,7 @@ abstract class AuthManagerSpecialPage extends SpecialPage {
 
                        if ( isset( $singleFieldInfo['options'] ) ) {
                                $descriptor['options'] = array_flip( array_map( function ( $message ) {
-                                       /** @var $message Message */
+                                       /** @var Message $message */
                                        return $message->parse();
                                }, $singleFieldInfo['options'] ) );
                        }