X-Git-Url: http://git.cyclocoop.org/%28?a=blobdiff_plain;f=includes%2FMWGrants.php;h=3079c65512fe07c08440fc49f5512c6c3a6d4528;hb=9c5a4773952f2e914eda668b71dedb7c78a9a258;hp=ba22590c92fc6dcba32d1015e80446b7f0ea7892;hpb=58858df842f91d9ea1c9f9b6f3c767d8b204886b;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/MWGrants.php b/includes/MWGrants.php index ba22590c92..3079c65512 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 ) ) { @@ -193,12 +193,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 = '';