From 9b0481bb63ff1bb3cf4b95d93a77fefcabc3247e Mon Sep 17 00:00:00 2001 From: Matthew Flaschen Date: Sat, 23 Aug 2014 21:12:26 -0400 Subject: [PATCH] Fix regression: Allow HTML as checkbox label in HTMLCheckField Follow-up to aa15d5287d898b624a30a70d14e495899f7d251e Change-Id: Ie9a6b3f017912d0f3493da09a267cf32852392af --- includes/htmlform/HTMLCheckField.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/includes/htmlform/HTMLCheckField.php b/includes/htmlform/HTMLCheckField.php index 4eb7e6ef96..5f70362a5a 100644 --- a/includes/htmlform/HTMLCheckField.php +++ b/includes/htmlform/HTMLCheckField.php @@ -5,6 +5,8 @@ */ class HTMLCheckField extends HTMLFormField { function getInputHTML( $value ) { + global $wgUseMediaWikiUIEverywhere; + if ( !empty( $this->mParams['invert'] ) ) { $value = !$value; } @@ -26,7 +28,19 @@ class HTMLCheckField extends HTMLFormField { ), Xml::check( $this->mName, $value, $attr ) . $this->mLabel ); } else { - return Xml::checkLabel( $this->mLabel, $this->mName, $this->mID, $value, $attr ); + $chkLabel = Xml::check( $this->mName, $value, $attr ) + . ' ' + . Html::rawElement( 'label', array( 'for' => $this->mID ), $this->mLabel ); + + if ( $wgUseMediaWikiUIEverywhere ) { + $chkLabel = Html::rawElement( + 'div', + array( 'class' => 'mw-ui-checkbox' ), + $chkLabel + ); + } + + return $chkLabel; } } -- 2.20.1