dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Pass "services" through from coreRoutes.json to ObjectFactory"
[lhc/web/wiklou.git]
/
includes
/
MWGrants.php
diff --git
a/includes/MWGrants.php
b/includes/MWGrants.php
index
769e5b4
..
cbe5a1a
100644
(file)
--- 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 ) {
* @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 = [];
}
$ret = [];
@@
-193,12
+191,10
@@
class MWGrants {
* @return string Wikitext
*/
public static function getGrantsWikiText( $grantsFilter, $lang = null ) {
* @return string Wikitext
*/
public static function getGrantsWikiText( $grantsFilter, $lang = null ) {
- global $wgContLang;
-
if ( is_string( $lang ) ) {
$lang = Language::factory( $lang );
} elseif ( $lang === null ) {
if ( is_string( $lang ) ) {
$lang = Language::factory( $lang );
} elseif ( $lang === null ) {
- $lang =
$wgContLang
;
+ $lang =
MediaWikiServices::getInstance()->getContentLanguage()
;
}
$s = '';
}
$s = '';