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 "Update ImportableUploadRevisionImporter for interwiki usernames"
[lhc/web/wiklou.git]
/
includes
/
Message.php
diff --git
a/includes/Message.php
b/includes/Message.php
index
5ca0942
..
3bd7755
100644
(file)
--- a/
includes/Message.php
+++ b/
includes/Message.php
@@
-20,6
+20,7
@@
* @file
* @author Niklas Laxström
*/
* @file
* @author Niklas Laxström
*/
+use MediaWiki\MediaWikiServices;
/**
* The Message class provides methods which fulfil two basic services:
/**
* The Message class provides methods which fulfil two basic services:
@@
-469,18
+470,20
@@
class Message implements MessageSpecifier, Serializable {
* @since 1.26
*/
public function getTitle() {
* @since 1.26
*/
public function getTitle() {
- global $wg
ContLang, $wg
ForceUIMsgAsContentMsg;
+ global $wgForceUIMsgAsContentMsg;
+ $contLang = MediaWikiServices::getInstance()->getContentLanguage();
+ $lang = $this->getLanguage();
$title = $this->key;
if (
$title = $this->key;
if (
- !$
this->language->equals( $wgC
ontLang )
+ !$
lang->equals( $c
ontLang )
&& in_array( $this->key, (array)$wgForceUIMsgAsContentMsg )
) {
&& in_array( $this->key, (array)$wgForceUIMsgAsContentMsg )
) {
- $code = $this->language->getCode();
- $title .= '/' . $code;
+ $title .= '/' . $lang->getCode();
}
}
- return Title::makeTitle( NS_MEDIAWIKI, $wgContLang->ucfirst( strtr( $title, ' ', '_' ) ) );
+ return Title::makeTitle(
+ NS_MEDIAWIKI, $contLang->ucfirst( strtr( $title, ' ', '_' ) ) );
}
/**
}
/**
@@
-766,8
+769,7
@@
class Message implements MessageSpecifier, Serializable {
return $this;
}
return $this;
}
- global $wgContLang;
- $this->inLanguage( $wgContLang );
+ $this->inLanguage( MediaWikiServices::getInstance()->getContentLanguage() );
return $this;
}
return $this;
}