1 files changed, 6 insertions, 119 deletions
diff --git a/includes/Xml.php b/includes/Xml.php
index f0bd70b2..37cffdef 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -144,26 +144,19 @@ class Xml {
 	public static function monthSelector( $selected = '', $allmonths = null, $id = 'month' ) {
 		global $wgLang;
 		$options = array();
+		$data = new XmlSelect( 'month', $id, $selected );
 		if ( is_null( $selected ) ) {
 			$selected = '';
 		}
 		if ( !is_null( $allmonths ) ) {
-			$options[] = self::option(
-				wfMessage( 'monthsall' )->text(),
-				$allmonths,
-				$selected === $allmonths
-			);
+			$options[wfMessage( 'monthsall' )->text()] = $allmonths;
 		}
 		for ( $i = 1; $i < 13; $i++ ) {
-			$options[] = self::option( $wgLang->getMonthName( $i ), $i, $selected === $i );
+			$options[$wgLang->getMonthName( $i )] = $i;
 		}
-		return self::openElement( 'select', array(
-			'id' => $id,
-			'name' => 'month',
-			'class' => 'mw-month-selector'
-		) )
-			. implode( "\n", $options )
-			. self::closeElement( 'select' );
+		$data->addOptions( $options );
+		$data->setAttribute( 'class', 'mw-month-selector' );
+		return $data->getHTML();
 	}
 
 	/**
@@ -871,112 +864,6 @@ class Xml {
 	}
 }
 
-class XmlSelect {
-	protected $options = array();
-	protected $default = false;
-	protected $attributes = array();
-
-	public function __construct( $name = false, $id = false, $default = false ) {
-		if ( $name ) {
-			$this->setAttribute( 'name', $name );
-		}
-
-		if ( $id ) {
-			$this->setAttribute( 'id', $id );
-		}
-
-		if ( $default !== false ) {
-			$this->default = $default;
-		}
-	}
-
-	/**
-	 * @param string $default
-	 */
-	public function setDefault( $default ) {
-		$this->default = $default;
-	}
-
-	/**
-	 * @param string $name
-	 * @param array $value
-	 */
-	public function setAttribute( $name, $value ) {
-		$this->attributes[$name] = $value;
-	}
-
-	/**
-	 * @param string $name
-	 * @return array|null
-	 */
-	public function getAttribute( $name ) {
-		if ( isset( $this->attributes[$name] ) ) {
-			return $this->attributes[$name];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @param string $name
-	 * @param bool $value
-	 */
-	public function addOption( $name, $value = false ) {
-		// Stab stab stab
-		$value = $value !== false ? $value : $name;
-
-		$this->options[] = array( $name => $value );
-	}
-
-	/**
-	 * This accepts an array of form
-	 * label => value
-	 * label => ( label => value, label => value )
-	 *
-	 * @param array $options
-	 */
-	public function addOptions( $options ) {
-		$this->options[] = $options;
-	}
-
-	/**
-	 * This accepts an array of form
-	 * label => value
-	 * label => ( label => value, label => value )
-	 *
-	 * @param array $options
-	 * @param bool $default
-	 * @return string
-	 */
-	static function formatOptions( $options, $default = false ) {
-		$data = '';
-
-		foreach ( $options as $label => $value ) {
-			if ( is_array( $value ) ) {
-				$contents = self::formatOptions( $value, $default );
-				$data .= Html::rawElement( 'optgroup', array( 'label' => $label ), $contents ) . "\n";
-			} else {
-				$data .= Xml::option( $label, $value, $value === $default ) . "\n";
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getHTML() {
-		$contents = '';
-
-		foreach ( $this->options as $options ) {
-			$contents .= self::formatOptions( $options, $this->default );
-		}
-
-		return Html::rawElement( 'select', $this->attributes, rtrim( $contents ) );
-	}
-}
-
 /**
  * A wrapper class which causes Xml::encodeJsVar() and Xml::encodeJsCall() to
  * interpret a given string as being a JavaScript expression, instead of string