X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FXml.php;h=4f2720ed859e299b6a2086201f198bf9bcb46d5d;hb=95627eb03d7534efee84bbea642699b54a72e5db;hp=0091513125ca68ee601dac526b532271fbba76cd;hpb=079d61fb79ac0a026c5a4c3b57bfbdaf3a037cd1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Xml.php b/includes/Xml.php
index 0091513125..4f2720ed85 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -49,7 +49,7 @@ class Xml {
 			if ( $allowShortTag && $contents === '' ) {
 				$out .= ' />';
 			} else {
-				$out .= '>' . htmlspecialchars( $contents ) . "</$element>";
+				$out .= '>' . htmlspecialchars( $contents, ENT_NOQUOTES ) . "</$element>";
 			}
 		}
 		return $out;
@@ -160,8 +160,9 @@ class Xml {
 	}
 
 	/**
-	 * @param int $year
-	 * @param int $month
+	 * @param int|string $year Use '' or 0 to start with no year preselected.
+	 * @param int|string $month A month in the 1..12 range. Use '', 0 or -1 to start with no month
+	 *  preselected.
 	 * @return string Formatted HTML
 	 */
 	public static function dateMenu( $year, $month ) {
@@ -213,10 +214,10 @@ class Xml {
 		// a custom language code might not have a defined name...
 		if ( !array_key_exists( $wgLanguageCode, $languages ) ) {
 			$languages[$wgLanguageCode] = $wgLanguageCode;
+			// Sort the array again
+			ksort( $languages );
 		}
 
-		ksort( $languages );
-
 		/**
 		 * If a bogus value is set, default to the content language.
 		 * Otherwise, no default is selected and the user ends up
@@ -532,8 +533,8 @@ class Xml {
 	 *
 	 * @param string $list Correctly formatted text (newline delimited) to be
 	 *   used to generate the options.
-	 * @param array $params Extra parameters
-	 * @param string $params['other'] If set, add an option with this as text and a value of 'other'
+	 * @param array $params Extra parameters:
+	 *   - string $params['other'] If set, add an option with this as text and a value of 'other'
 	 * @return array Array keys are textual labels, values are internal values
 	 */
 	public static function listDropDownOptions( $list, $params = [] ) {