Fix undefined $ok in DatabaseUpdater::migrateComments

[lhc/web/wiklou.git] / includes / htmlform / fields / HTMLSelectOrOtherField.php

diff --git a/includes/htmlform/fields/HTMLSelectOrOtherField.php b/includes/htmlform/fields/HTMLSelectOrOtherField.php
index a009b28..fb133f2 100644 (file)
--- a/includes/htmlform/fields/HTMLSelectOrOtherField.php
+++ b/includes/htmlform/fields/HTMLSelectOrOtherField.php
@@ -85,7 +85,6 @@ class HTMLSelectOrOtherField extends HTMLTextField {
 
                # DropdownInput
                $dropdownAttribs = [
-                       'id' => $this->mID,
                        'name' => $this->mName,
                        'options' => $this->getOptionsOOUI(),
                        'value' => $valInSelect ? $value : 'other',
@@ -103,7 +102,6 @@ class HTMLSelectOrOtherField extends HTMLTextField {
 
                # TextInput
                $textAttribs = [
-                       'id' => $this->mID . '-other',
                        'name' => $this->mName . '-other',
                        'size' => $this->getSize(),
                        'value' => $valInSelect ? '' : $value,
@@ -130,6 +128,7 @@ class HTMLSelectOrOtherField extends HTMLTextField {
                }
 
                return $this->getInputWidget( [
+                       'id' => $this->mID,
                        'textinput' => $textAttribs,
                        'dropdowninput' => $dropdownAttribs,
                        'or' => true,
@@ -137,7 +136,7 @@ class HTMLSelectOrOtherField extends HTMLTextField {
        }
 
        public function getInputWidget( $params ) {
-               return new Mediawiki\Widget\SelectWithInputWidget( $params );
+               return new MediaWiki\Widget\SelectWithInputWidget( $params );
        }
 
        /**