From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Sun, 26 Jul 2015 23:22:56 +0000 (+0200)
Subject: Kill broken OOUI implementations of HTMLSelectAndOtherField, HTMLSelectOrOtherField
X-Git-Tag: 1.31.0-rc.0~10641
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=5b6559ebca3f2bc277004dc9a5794d91ad5ea728;p=lhc%2Fweb%2Fwiklou.git

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 23ca3bf3aa..0e4f4f3266 100644
--- 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 cbf7d122d7..3e7acdf881 100644
--- 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
 	 *