Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 48 insertions, 0 deletions

diff --git a/vendor/oojs/oojs-ui/php/widgets/LabelWidget.php b/vendor/oojs/oojs-ui/php/widgets/LabelWidget.php
new file mode 100644
index 00000000..b59a5f25
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/widgets/LabelWidget.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Label widget.
+ */
+class LabelWidget extends Widget {
+
+	/* Static properties */
+
+	public static $tagName = 'span';
+
+	/* Properties */
+
+	/**
+	 * Associated input element.
+	 *
+	 * @var InputWidget|null
+	 */
+	protected $input;
+
+	/**
+	 * @param array $config Configuration options
+	 * @param InputWidget $config['input'] Input widget this label is for
+	 */
+	public function __construct( array $config = array() ) {
+		// Parent constructor
+		parent::__construct( $config );
+
+		// Mixins
+		$this->mixin( new LabelElement( $this,
+			array_merge( $config, array( 'labelElement' => $this ) ) ) );
+
+		// Properties
+		$this->input = isset( $config['input'] ) ? $config['input'] : null;
+
+		// Initialization
+		$this->addClasses( array( 'oo-ui-labelWidget' ) );
+	}
+
+	public function getConfig( &$config ) {
+		if ( $this->input !== null ) {
+			$config['input'] = $this->input;
+		}
+		return parent::getConfig( $config );
+	}
+}