From 5b6559ebca3f2bc277004dc9a5794d91ad5ea728 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Mon, 27 Jul 2015 01:22:56 +0200 Subject: [PATCH] Kill broken OOUI implementations of HTMLSelectAndOtherField, HTMLSelectOrOtherField MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- includes/htmlform/HTMLSelectAndOtherField.php | 4 ++++ includes/htmlform/HTMLSelectOrOtherField.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/includes/htmlform/HTMLSelectAndOtherField.php b/includes/htmlform/HTMLSelectAndOtherField.php index 23ca3bf3aa..0e4f4f3266 100644 --- a/includes/htmlform/HTMLSelectAndOtherField.php +++ b/includes/htmlform/HTMLSelectAndOtherField.php @@ -64,6 +64,10 @@ class HTMLSelectAndOtherField extends HTMLSelectField { return "$select
\n$textbox"; } + function getInputOOUI( $value ) { + return false; + } + /** * @param WebRequest $request * diff --git a/includes/htmlform/HTMLSelectOrOtherField.php b/includes/htmlform/HTMLSelectOrOtherField.php index cbf7d122d7..3e7acdf881 100644 --- a/includes/htmlform/HTMLSelectOrOtherField.php +++ b/includes/htmlform/HTMLSelectOrOtherField.php @@ -62,6 +62,10 @@ class HTMLSelectOrOtherField extends HTMLTextField { return "$select
\n$textbox"; } + function getInputOOUI( $value ) { + return false; + } + /** * @param WebRequest $request * -- 2.20.1