From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 17 Oct 2017 22:06:25 +0000 (+0000)
Subject: Merge "Fix login button label to accept RawMessage."
X-Git-Tag: 1.31.0-rc.0~1737
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=1d9da64faee7051965955159feb95b8dc1617e97;hp=b52657059ea1a6ad1868af3a46db30ed3c64334a;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix login button label to accept RawMessage."
---

diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php
index 0cdc55f060..95729f3c56 100644
--- a/includes/specialpage/AuthManagerSpecialPage.php
+++ b/includes/specialpage/AuthManagerSpecialPage.php
@@ -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