X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMagicWordArray.php;h=73d5173d0738d212db1d049d0d6fb598f0847d5c;hb=ffc750c2d5d9ead5de61752593525081eb586475;hp=fde32ce4fd6a6b90833d7de93c5fada98a03df55;hpb=15f6eff90c305d405fe4331c8a8dc8caa842e5b3;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/MagicWordArray.php b/includes/MagicWordArray.php index fde32ce4fd..73d5173d07 100644 --- a/includes/MagicWordArray.php +++ b/includes/MagicWordArray.php @@ -49,10 +49,7 @@ class MagicWordArray { */ public function __construct( $names = [], MagicWordFactory $factory = null ) { $this->names = $names; - $this->factory = $factory; - if ( !$factory ) { - $this->factory = MediaWikiServices::getInstance()->getMagicWordFactory(); - } + $this->factory = $factory ?: MediaWikiServices::getInstance()->getMagicWordFactory(); } /** @@ -268,10 +265,7 @@ class MagicWordArray { return $hash[1][$text]; } $lc = $this->factory->getContentLanguage()->lc( $text ); - if ( isset( $hash[0][$lc] ) ) { - return $hash[0][$lc]; - } - return false; + return $hash[0][$lc] ?? false; } /**