From: Geoffrey Mon <geofbot@gmail.com>
Date: Sun, 13 Sep 2015 22:52:33 +0000 (+0000)
Subject: Enable multiple default values for XmlSelect
X-Git-Tag: 1.31.0-rc.0~10024^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=e36845aac66286ad9912d5d44ee7d226e7c4f616

Enable multiple default values for XmlSelect

Useful for when a <select> tag with the 'multiple' attribute is
needed.

Bug: T93234
Change-Id: Ib83aed3392cf15cce4637fac56979a0f6b3d6b2f
---

diff --git a/includes/XmlSelect.php b/includes/XmlSelect.php
index e765eedbc3..78f476452f 100644
--- a/includes/XmlSelect.php
+++ b/includes/XmlSelect.php
@@ -43,7 +43,7 @@ class XmlSelect {
 	}
 
 	/**
-	 * @param string $default
+	 * @param string|array $default
 	 */
 	public function setDefault( $default ) {
 		$this->default = $default;
@@ -95,7 +95,7 @@ class XmlSelect {
 	 * label => ( label => value, label => value )
 	 *
 	 * @param array $options
-	 * @param string $default
+	 * @param string|array $default
 	 * @return string
 	 */
 	static function formatOptions( $options, $default = false ) {
@@ -106,7 +106,11 @@ class XmlSelect {
 				$contents = self::formatOptions( $value, $default );
 				$data .= Html::rawElement( 'optgroup', array( 'label' => $label ), $contents ) . "\n";
 			} else {
-				$data .= Xml::option( $label, $value, $value === $default ) . "\n";
+				// If $default is an array, then the <select> probably has the multiple attribute,
+				// so we should check if each $value is in $default, rather than checking if
+				// $value is equal to $default.
+				$selected = is_array( $default ) ? in_array( $value, $default ) : $value === $default;
+				$data .= Xml::option( $label, $value, $selected ) . "\n";
 			}
 		}