Merge "(bug 47070) check content model namespace on import."

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

diff --git a/includes/htmlform/HTMLButtonField.php b/includes/htmlform/HTMLButtonField.php
index c95d73b..f8d017c 100644 (file)
--- a/includes/htmlform/HTMLButtonField.php
+++ b/includes/htmlform/HTMLButtonField.php
@@ -19,11 +19,7 @@ class HTMLButtonField extends HTMLFormField {
                $attr = array(
                        'class' => 'mw-htmlform-submit ' . $this->mClass,
                        'id' => $this->mID,
-               );
-
-               if ( !empty( $this->mParams['disabled'] ) ) {
-                       $attr['disabled'] = 'disabled';
-               }
+               ) + $this->getAttributes( array( 'disabled', 'tabindex' ) );
 
                return Html::input( $this->mName, $value, $this->buttonType, $attr );
        }