Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 42 insertions, 0 deletions

diff --git a/includes/htmlform/HTMLButtonField.php b/includes/htmlform/HTMLButtonField.php
new file mode 100644
index 00000000..09c0ad97
--- /dev/null
+++ b/includes/htmlform/HTMLButtonField.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Adds a generic button inline to the form. Does not do anything, you must add
+ * click handling code in JavaScript. Use a HTMLSubmitField if you merely
+ * wish to add a submit button to a form.
+ *
+ * @since 1.22
+ */
+class HTMLButtonField extends HTMLFormField {
+	protected $buttonType = 'button';
+
+	public function __construct( $info ) {
+		$info['nodata'] = true;
+		parent::__construct( $info );
+	}
+
+	public function getInputHTML( $value ) {
+		$attr = array(
+			'class' => 'mw-htmlform-submit ' . $this->mClass,
+			'id' => $this->mID,
+		) + $this->getAttributes( array( 'disabled', 'tabindex' ) );
+
+		return Html::input( $this->mName, $value, $this->buttonType, $attr );
+	}
+
+	protected function needsLabel() {
+		return false;
+	}
+
+	/**
+	 * Button cannot be invalid
+	 *
+	 * @param string $value
+	 * @param array $alldata
+	 *
+	 * @return bool
+	 */
+	public function validate( $value, $alldata ) {
+		return true;
+	}
+}