Kill broken OOUI implementations of HTMLSelectAndOtherField, HTMLSelectOrOtherField

They inherited getInputOOUI() from their respective parents, which
obviously didn't work correctly. These shouldn't be inheriting from
incompatible parents, probably… but meh.

Change-Id: Id99ee74c4efd27fab0ee32555723a02df8015458

diff --git a/includes/htmlform/HTMLSelectAndOtherField.php b/includes/htmlform/HTMLSelectAndOtherField.php
index 23ca3bf..0e4f4f3 100644 (file)
--- a/includes/htmlform/HTMLSelectAndOtherField.php
+++ b/includes/htmlform/HTMLSelectAndOtherField.php
@@ -64,6 +64,10 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
                return "$select<br />\n$textbox";
        }
 
+       function getInputOOUI( $value ) {
+               return false;
+       }
+
        /**
         * @param WebRequest $request
         *

diff --git a/includes/htmlform/HTMLSelectOrOtherField.php b/includes/htmlform/HTMLSelectOrOtherField.php
index cbf7d12..3e7acdf 100644 (file)
--- a/includes/htmlform/HTMLSelectOrOtherField.php
+++ b/includes/htmlform/HTMLSelectOrOtherField.php
@@ -62,6 +62,10 @@ class HTMLSelectOrOtherField extends HTMLTextField {
                return "$select<br />\n$textbox";
        }
 
+       function getInputOOUI( $value ) {
+               return false;
+       }
+
        /**
         * @param WebRequest $request
         *