X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMWGrants.php;h=cbe5a1a141a77f379f53e6a06d9dc618b3efb45c;hb=824ecd9b75bcbcbda0d9330656ea0f06ce288c3a;hp=c7c54fd5037fddc676df222565278e345d5890a6;hpb=cf3deb6637cf4aab2678949e5ccec8084eec9907;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MWGrants.php b/includes/MWGrants.php
index c7c54fd503..cbe5a1a141 100644
--- a/includes/MWGrants.php
+++ b/includes/MWGrants.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Functions and constants to deal with grants
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -16,6 +14,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
  */
 use MediaWiki\MediaWikiServices;
 
@@ -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 = '';