X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMWGrants.php;h=cbe5a1a141a77f379f53e6a06d9dc618b3efb45c;hb=13832025a46df3e0edd658dfb756159c2c5ac722;hp=769e5b4da485e8a7aa4ca52f04e9a47b3f2f1ed8;hpb=0394e1354081b622a453553ddb2ef0b935cd8dd3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MWGrants.php b/includes/MWGrants.php
index 769e5b4da4..cbe5a1a141 100644
--- a/includes/MWGrants.php
+++ b/includes/MWGrants.php
@@ -86,10 +86,8 @@ class MWGrants {
 	 * @return string[] Corresponding grant descriptions
 	 */
 	public static function grantNames( array $grants, $lang = null ) {
-		if ( $lang !== null ) {
-			if ( is_string( $lang ) ) {
-				$lang = Language::factory( $lang );
-			}
+		if ( $lang !== null && is_string( $lang ) ) {
+			$lang = Language::factory( $lang );
 		}
 
 		$ret = [];
@@ -193,12 +191,10 @@ class MWGrants {
 	 * @return string Wikitext
 	 */
 	public static function getGrantsWikiText( $grantsFilter, $lang = null ) {
-		global $wgContLang;
-
 		if ( is_string( $lang ) ) {
 			$lang = Language::factory( $lang );
 		} elseif ( $lang === null ) {
-			$lang = $wgContLang;
+			$lang = MediaWikiServices::getInstance()->getContentLanguage();
 		}
 
 		$s = '';