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

diff --git a/includes/Xml.php b/includes/Xml.php
index 7dcd4a4327..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;
@@ -214,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