Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / includes / htmlform / HTMLButtonField.php

diff --git a/includes/htmlform/HTMLButtonField.php b/includes/htmlform/HTMLButtonField.php
index b4849e5..16417fc 100644 (file)
--- a/includes/htmlform/HTMLButtonField.php
+++ b/includes/htmlform/HTMLButtonField.php
@@ -25,7 +25,7 @@ class HTMLButtonField extends HTMLFormField {
        protected $buttonLabel = null;
 
        /** @var array $mFlags Flags to add to OOUI Button widget */
-       protected $mFlags = array();
+       protected $mFlags = [];
 
        public function __construct( $info ) {
                $info['nodata'] = true;
@@ -41,7 +41,7 @@ class HTMLButtonField extends HTMLFormField {
                                $msg = array_shift( $msgInfo );
                        } else {
                                $msg = $msgInfo;
-                               $msgInfo = array();
+                               $msgInfo = [];
                        }
 
                        $this->buttonLabel = $this->msg( $msg, $msgInfo )->parse();
@@ -56,6 +56,8 @@ class HTMLButtonField extends HTMLFormField {
                        $this->buttonLabel = $info['buttonlabel-raw'];
                }
 
+               $this->setShowEmptyLabel( false );
+
                parent::__construct( $info );
        }
 
@@ -72,13 +74,13 @@ class HTMLButtonField extends HTMLFormField {
                foreach ( $this->mFlags as $flag ) {
                        $flags .= ' ' . $prefix . $flag;
                }
-               $attr = array(
+               $attr = [
                        'class' => 'mw-htmlform-submit ' . $this->mClass . $flags,
                        'id' => $this->mID,
                        'type' => $this->buttonType,
                        'name' => $this->mName,
                        'value' => $value,
-               ) + $this->getAttributes( array( 'disabled', 'tabindex' ) );
+               ] + $this->getAttributes( [ 'disabled', 'tabindex' ] );
 
                if ( $this->isBadIE() ) {
                        return Html::element( 'input', $attr );
@@ -93,18 +95,20 @@ class HTMLButtonField extends HTMLFormField {
         * @return OOUI\ButtonInputWidget
         */
        public function getInputOOUI( $value ) {
-               return new OOUI\ButtonInputWidget( array(
+               return new OOUI\ButtonInputWidget( [
                        'name' => $this->mName,
                        'value' => $value,
                        'label' => !$this->isBadIE() && $this->buttonLabel
                                ? new OOUI\HtmlSnippet( $this->buttonLabel )
                                : $value,
                        'type' => $this->buttonType,
-                       'classes' => array( 'mw-htmlform-submit', $this->mClass ),
+                       'classes' => [ 'mw-htmlform-submit', $this->mClass ],
                        'id' => $this->mID,
                        'flags' => $this->mFlags,
                        'useInputTag' => $this->isBadIE(),
-               ) + $this->getAttributes( array( 'disabled', 'tabindex' ), array( 'tabindex' => 'tabIndex' ) ) );
+               ] + OOUI\Element::configFromHtmlAttributes(
+                       $this->getAttributes( [ 'disabled', 'tabindex' ] )
+               ) );
        }
 
        protected function needsLabel() {