From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- includes/htmlform/HTMLCheckMatrix.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'includes/htmlform/HTMLCheckMatrix.php') diff --git a/includes/htmlform/HTMLCheckMatrix.php b/includes/htmlform/HTMLCheckMatrix.php index 6c538fdd..83f12665 100644 --- a/includes/htmlform/HTMLCheckMatrix.php +++ b/includes/htmlform/HTMLCheckMatrix.php @@ -178,6 +178,13 @@ class HTMLCheckMatrix extends HTMLFormField implements HTMLNestedFilterable { $helptext = $this->getHelpTextHtmlTable( $this->getHelpText() ); $cellAttributes = array( 'colspan' => 2 ); + $hideClass = ''; + $hideAttributes = array(); + if ( $this->mHideIf ) { + $hideAttributes['data-hide-if'] = FormatJson::encode( $this->mHideIf ); + $hideClass = 'mw-htmlform-hide-if'; + } + $label = $this->getLabelHtml( $cellAttributes ); $field = Html::rawElement( @@ -186,9 +193,12 @@ class HTMLCheckMatrix extends HTMLFormField implements HTMLNestedFilterable { $inputHtml . "\n$errors" ); - $html = Html::rawElement( 'tr', array( 'class' => 'mw-htmlform-vertical-label' ), $label ); + $html = Html::rawElement( 'tr', + array( 'class' => "mw-htmlform-vertical-label $hideClass" ) + $hideAttributes, + $label ); $html .= Html::rawElement( 'tr', - array( 'class' => "mw-htmlform-field-$fieldType {$this->mClass} $errorClass" ), + array( 'class' => "mw-htmlform-field-$fieldType {$this->mClass} $errorClass $hideClass" ) + + $hideAttributes, $field ); return $html . $helptext; -- cgit v1.2.3-54-g00ecf