Merge commit 'fa89acd'

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

1 files changed, 15 insertions, 1 deletions

diff --git a/includes/htmlform/HTMLSelectNamespace.php b/includes/htmlform/HTMLSelectNamespace.php
index 96381062..4efdfbf3 100644
--- a/includes/htmlform/HTMLSelectNamespace.php
+++ b/includes/htmlform/HTMLSelectNamespace.php
@@ -3,11 +3,16 @@
  * Wrapper for Html::namespaceSelector to use in HTMLForm
  */
 class HTMLSelectNamespace extends HTMLFormField {
+	public function __construct( $params ) {
+		parent::__construct( $params );
+		$this->mAllValue = isset( $this->mParams['all'] ) ? $this->mParams['all'] : 'all';
+	}
+
 	function getInputHTML( $value ) {
 		return Html::namespaceSelector(
 			array(
 				'selected' => $value,
-				'all' => 'all'
+				'all' => $this->mAllValue
 			), array(
 				'name' => $this->mName,
 				'id' => $this->mID,
@@ -15,4 +20,13 @@ class HTMLSelectNamespace extends HTMLFormField {
 			)
 		);
 	}
+
+	public function getInputOOUI( $value ) {
+		return new MediaWiki\Widget\NamespaceInputWidget( array(
+			'value' => $value,
+			'name' => $this->mName,
+			'id' => $this->mID,
+			'includeAllValue' => $this->mAllValue,
+		) );
+	}
 }