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 "objectcache: move MemcachedClient class to /utils subdir"
[lhc/web/wiklou.git]
/
includes
/
MagicWord.php
diff --git
a/includes/MagicWord.php
b/includes/MagicWord.php
index
3c77234
..
cb58e62
100644
(file)
--- a/
includes/MagicWord.php
+++ b/
includes/MagicWord.php
@@
-55,7
+55,7
@@
use MediaWiki\MediaWikiServices;
* @ingroup Parser
*/
class MagicWord {
* @ingroup Parser
*/
class MagicWord {
- /**
#@-
*/
+ /**
#@-
*/
/** @var string */
public $mId;
/** @var string */
public $mId;
@@
-93,7
+93,7
@@
class MagicWord {
/** @var Language */
private $contLang;
/** @var Language */
private $contLang;
- /**
#@-
*/
+ /**
#@-
*/
/**
* Create a new MagicWord object
/**
* Create a new MagicWord object
@@
-109,11
+109,7
@@
class MagicWord {
$this->mId = $id;
$this->mSynonyms = (array)$syn;
$this->mCaseSensitive = $cs;
$this->mId = $id;
$this->mSynonyms = (array)$syn;
$this->mCaseSensitive = $cs;
- $this->contLang = $contLang;
-
- if ( !$contLang ) {
- $this->contLang = MediaWikiServices::getInstance()->getContentLanguage();
- }
+ $this->contLang = $contLang ?: MediaWikiServices::getInstance()->getContentLanguage();
}
/**
}
/**