X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMWGrants.php;h=cbe5a1a141a77f379f53e6a06d9dc618b3efb45c;hb=9ded67d0da1e75fa3a23e915b498ddf7fd3a348b;hp=ba22590c92fc6dcba32d1015e80446b7f0ea7892;hpb=0c2687f44eb0e8c7f480b7303f89056682ba0bfb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MWGrants.php b/includes/MWGrants.php
index ba22590c92..cbe5a1a141 100644
--- a/includes/MWGrants.php
+++ b/includes/MWGrants.php
@@ -58,11 +58,11 @@ class MWGrants {
 		// Give grep a chance to find the usages:
 		// grant-blockusers, grant-createeditmovepage, grant-delete,
 		// grant-editinterface, grant-editmycssjs, grant-editmywatchlist,
-		// grant-editpage, grant-editprotected, grant-highvolume,
-		// grant-oversight, grant-patrol, grant-protect, grant-rollback,
-		// grant-sendemail, grant-uploadeditmovefile, grant-uploadfile,
-		// grant-basic, grant-viewdeleted, grant-viewmywatchlist,
-		// grant-createaccount
+		// grant-editsiteconfig, grant-editpage, grant-editprotected,
+		// grant-highvolume, grant-oversight, grant-patrol, grant-protect,
+		// grant-rollback, grant-sendemail, grant-uploadeditmovefile,
+		// grant-uploadfile, grant-basic, grant-viewdeleted,
+		// grant-viewmywatchlist, grant-createaccount
 		$msg = wfMessage( "grant-$grant" );
 		if ( $lang !== null ) {
 			if ( is_string( $lang ) ) {
@@ -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 = '';