From 5f8ea50bd99939c3014733edd4e9689145e3f2a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Mon, 30 May 2016 17:00:00 +0200 Subject: [PATCH] HTMLRadioField: Only add 'mw-ui' classes when needed Otherwise the field would change if something loaded the deprecated 'mediawiki.ui' style modules. Bug: T133114 Change-Id: I06ddeade961bdf11eda6572d246333d750cfc2ab --- includes/htmlform/HTMLRadioField.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/includes/htmlform/HTMLRadioField.php b/includes/htmlform/HTMLRadioField.php index 12a8a1fd37..9d3cc13a12 100644 --- a/includes/htmlform/HTMLRadioField.php +++ b/includes/htmlform/HTMLRadioField.php @@ -59,6 +59,8 @@ class HTMLRadioField extends HTMLFormField { } function formatOptions( $options, $value ) { + global $wgUseMediaWikiUIEverywhere; + $html = ''; $attribs = $this->getAttributes( [ 'disabled', 'tabindex' ] ); @@ -71,12 +73,16 @@ class HTMLRadioField extends HTMLFormField { $html .= $this->formatOptions( $info, $value ); } else { $id = Sanitizer::escapeId( $this->mID . "-$info" ); + $classes = [ 'mw-htmlform-flatlist-item' ]; + if ( $wgUseMediaWikiUIEverywhere || $this->mParent instanceof VFormHTMLForm ) { + $classes[] = 'mw-ui-radio'; + } $radio = Xml::radio( $this->mName, $info, $info === $value, $attribs + [ 'id' => $id ] ); $radio .= ' ' . call_user_func( $elementFunc, 'label', [ 'for' => $id ], $label ); $html .= ' ' . Html::rawElement( 'div', - [ 'class' => 'mw-htmlform-flatlist-item mw-ui-radio' ], + [ 'class' => $classes ], $radio ); } -- 2.20.1