jenkins-bot has submitted this change and it was merged.
Change subject: Kill broken OOUI implementations of HTMLSelectAndOtherField,
HTMLSelectOrOtherField
......................................................................
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
---
M includes/htmlform/HTMLSelectAndOtherField.php
M includes/htmlform/HTMLSelectOrOtherField.php
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/htmlform/HTMLSelectAndOtherField.php
b/includes/htmlform/HTMLSelectAndOtherField.php
index 23ca3bf..0e4f4f3 100644
--- a/includes/htmlform/HTMLSelectAndOtherField.php
+++ b/includes/htmlform/HTMLSelectAndOtherField.php
@@ -64,6 +64,10 @@
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
--- a/includes/htmlform/HTMLSelectOrOtherField.php
+++ b/includes/htmlform/HTMLSelectOrOtherField.php
@@ -62,6 +62,10 @@
return "$select<br />\n$textbox";
}
+ function getInputOOUI( $value ) {
+ return false;
+ }
+
/**
* @param WebRequest $request
*
--
To view, visit https://gerrit.wikimedia.org/r/227174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id99ee74c4efd27fab0ee32555723a02df8015458
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits