X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FXml.php;h=febf03e7a22fc453f7257c93713b7ce8820a340f;hb=1e56f9b78a5ee19ae2aa14436afa6fba7d59c4f9;hp=8c65461680b9c66eb24f41d90fc1681d4eda679c;hpb=925c20a9ca669c67cc44f4468d0e0f3b33b94213;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Xml.php b/includes/Xml.php
index 8c65461680..febf03e7a2 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -20,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * Module of static functions for generating XML
  */
@@ -45,12 +47,10 @@ class Xml {
 		}
 		if ( is_null( $contents ) ) {
 			$out .= '>';
+		} elseif ( $allowShortTag && $contents === '' ) {
+			$out .= ' />';
 		} else {
-			if ( $allowShortTag && $contents === '' ) {
-				$out .= ' />';
-			} else {
-				$out .= '>' . htmlspecialchars( $contents, ENT_NOQUOTES ) . "</$element>";
-			}
+			$out .= '>' . htmlspecialchars( $contents, ENT_NOQUOTES ) . "</$element>";
 		}
 		return $out;
 	}
@@ -79,9 +79,8 @@ class Xml {
 	}
 
 	/**
-	 * Format an XML element as with self::element(), but run text through the
-	 * $wgContLang->normalize() validator first to ensure that no invalid UTF-8
-	 * is passed.
+	 * Format an XML element as with self::element(), but run text through the content language's
+	 * normalize() validator first to ensure that no invalid UTF-8 is passed.
 	 *
 	 * @param string $element
 	 * @param array $attribs Name=>value pairs. Values will be escaped.
@@ -89,12 +88,12 @@ class Xml {
 	 * @return string
 	 */
 	public static function elementClean( $element, $attribs = [], $contents = '' ) {
-		global $wgContLang;
 		if ( $attribs ) {
 			$attribs = array_map( [ 'UtfNormal\Validator', 'cleanUp' ], $attribs );
 		}
 		if ( $contents ) {
-			$contents = $wgContLang->normalize( $contents );
+			$contents =
+				MediaWikiServices::getInstance()->getContentLanguage()->normalize( $contents );
 		}
 		return self::element( $element, $attribs, $contents );
 	}
@@ -453,7 +452,7 @@ class Xml {
 	/**
 	 * Convenience function to build an HTML submit button
 	 * When $wgUseMediaWikiUIEverywhere is true it will default to a progressive button
-	 * @param string $value Label text for the button
+	 * @param string $value Label text for the button (unescaped)
 	 * @param array $attribs Optional custom attributes
 	 * @return string HTML
 	 */