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

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

diff --git a/includes/htmlform/HTMLSelectAndOtherField.php b/includes/htmlform/HTMLSelectAndOtherField.php
index 7b2e865..044670d 100644 (file)
--- a/includes/htmlform/HTMLSelectAndOtherField.php
+++ b/includes/htmlform/HTMLSelectAndOtherField.php
@@ -90,11 +90,15 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
                        $textAttribs['class'] = $this->mClass;
                }
 
-               foreach ( array( 'required', 'autofocus', 'multiple', 'disabled' ) as $param ) {
-                       if ( isset( $this->mParams[$param] ) ) {
-                               $textAttribs[$param] = '';
-                       }
-               }
+               $allowedParams = array(
+                       'required',
+                       'autofocus',
+                       'multiple',
+                       'disabled',
+                       'tabindex'
+               );
+
+               $textAttribs += $this->getAttributes( $allowedParams );
 
                $textbox = Html::input( $this->mName . '-other', $value[2], 'text', $textAttribs );