3 files changed, 12 insertions, 0 deletions
diff --git a/includes/htmlform/fields/HTMLFormFieldWithButton.php b/includes/htmlform/fields/HTMLFormFieldWithButton.php
index 8e95a7655641..043e1ee8e9e1 100644
--- a/includes/htmlform/fields/HTMLFormFieldWithButton.php
+++ b/includes/htmlform/fields/HTMLFormFieldWithButton.php
@@ -2,6 +2,8 @@
 /**
  * Enables HTMLFormField elements to be build with a button.
  *
+ * TODO This class should be a trait
+ *
  * @stable to extend
  */
 class HTMLFormFieldWithButton extends HTMLFormField {
diff --git a/includes/htmlform/fields/HTMLSelectNamespaceWithButton.php b/includes/htmlform/fields/HTMLSelectNamespaceWithButton.php
index 636b54a24e7f..efbc9b7d22b5 100644
--- a/includes/htmlform/fields/HTMLSelectNamespaceWithButton.php
+++ b/includes/htmlform/fields/HTMLSelectNamespaceWithButton.php
@@ -20,4 +20,9 @@ class HTMLSelectNamespaceWithButton extends HTMLSelectNamespace {
 	public function getInputHTML( $value ) {
 		return $this->mClassWithButton->getElement( parent::getInputHTML( $value ) );
 	}
+
+	protected function getFieldLayoutOOUI( $inputField, $config ) {
+		$buttonWidget = $this->mClassWithButton->getInputOOUI( '' );
+		return new HTMLFormActionFieldLayout( $inputField, $buttonWidget, $config );
+	}
 }
diff --git a/includes/htmlform/fields/HTMLTextFieldWithButton.php b/includes/htmlform/fields/HTMLTextFieldWithButton.php
index 6105acb989b3..24fbc9e4ee87 100644
--- a/includes/htmlform/fields/HTMLTextFieldWithButton.php
+++ b/includes/htmlform/fields/HTMLTextFieldWithButton.php
@@ -20,4 +20,9 @@ class HTMLTextFieldWithButton extends HTMLTextField {
 	public function getInputHTML( $value ) {
 		return $this->mClassWithButton->getElement( parent::getInputHTML( $value ) );
 	}
+
+	protected function getFieldLayoutOOUI( $inputField, $config ) {
+		$buttonWidget = $this->mClassWithButton->getInputOOUI( '' );
+		return new HTMLFormActionFieldLayout( $inputField, $buttonWidget, $config );
+	}
 }