Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 17 insertions, 0 deletions

diff --git a/includes/htmlform/HTMLTextFieldWithButton.php b/includes/htmlform/HTMLTextFieldWithButton.php
new file mode 100644
index 00000000..c6dac322
--- /dev/null
+++ b/includes/htmlform/HTMLTextFieldWithButton.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Creates a text input field with a button assigned to the input field.
+ */
+class HTMLTextFieldWithButton extends HTMLTextField {
+	/** @var HTMLFormClassWithButton $mClassWithButton */
+	protected $mClassWithButton = null;
+
+	public function __construct( $info ) {
+		$this->mClassWithButton = new HTMLFormFieldWithButton( $info );
+		parent::__construct( $info );
+	}
+
+	public function getInputHTML( $value ) {
+		return $this->mClassWithButton->getElement( parent::getInputHTML( $value ) );
+	}
+}