From: Matthew Flaschen <mflaschen@wikimedia.org>
Date: Wed, 1 Oct 2014 06:15:02 +0000 (-0400)
Subject: Fix input regression affecting HTMLForms that use VForm
X-Git-Tag: 1.31.0-rc.0~13737^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=c1bf30c2e55a7bae04b3c5e232f5017ed79bbd80;p=lhc%2Fweb%2Fwiklou.git

Fix input regression affecting HTMLForms that use VForm

Although the classes (e.g. mw-ui-input) are still there,
the style module was not being loaded.

This affects forms that deliberately use VForm even without
wgUseMediaWikiUIEverywhere (since they pre-date it).

This applies at least to PasswordReset, which was added in
d32891d99f185e5cf2b0e25bf947de221d4c3295 (last October).

Bug: 71448
Change-Id: Ieca36c0036d4c93244c533237eddd678564dd3c0
---

diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 6589b2ac22..4511046ff4 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -788,9 +788,14 @@ class HTMLForm extends ContextSource {
 		$this->getOutput()->preventClickjacking();
 		$this->getOutput()->addModules( 'mediawiki.htmlform' );
 		if ( $this->isVForm() ) {
+			// This is required for VForm HTMLForms that use that style regardless
+			// of wgUseMediaWikiUIEverywhere (since they pre-date it).
+			// When wgUseMediaWikiUIEverywhere is removed, this should be consolidated
+			// with the addModuleStyles in SpecialPage->setHeaders.
 			$this->getOutput()->addModuleStyles( array(
 				'mediawiki.ui',
 				'mediawiki.ui.button',
+				'mediawiki.ui.input',
 			) );
 			// @todo Should vertical form set setWrapperLegend( false )
 			// to hide ugly fieldsets?