X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialMyLanguage.php;h=71b18930c8078b6932b5440f58f2774dfea1c0cd;hb=f311f96e98b133849b505a07b0a674fdbe67025d;hp=01bf0ecaa13fdf2829bef857c2475c5854c4737a;hpb=9fc8b2228e63397e3849607de96d9fa15a1ff38c;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/specials/SpecialMyLanguage.php b/includes/specials/SpecialMyLanguage.php index 01bf0ecaa1..71b18930c8 100644 --- a/includes/specials/SpecialMyLanguage.php +++ b/includes/specials/SpecialMyLanguage.php @@ -59,11 +59,10 @@ class SpecialMyLanguage extends RedirectSpecialArticle { * it returns Page/fi if it exists, otherwise Page/de if it exists, * otherwise Page. * - * @param $par + * @param string $par * @return Title|null */ public function findTitle( $par ) { - global $wgLanguageCode; // base = title without language code suffix // provided = the title as it was given $base = $provided = Title::newFromText( $par ); @@ -72,7 +71,7 @@ class SpecialMyLanguage extends RedirectSpecialArticle { $pos = strrpos( $par, '/' ); $basepage = substr( $par, 0, $pos ); $code = substr( $par, $pos + 1 ); - if ( Language::isKnownLanguageTag( $code ) ) { + if ( strlen( $code ) && Language::isKnownLanguageTag( $code ) ) { $base = Title::newFromText( $basepage ); } } @@ -83,7 +82,7 @@ class SpecialMyLanguage extends RedirectSpecialArticle { $uiCode = $this->getLanguage()->getCode(); $proposed = $base->getSubpage( $uiCode ); - if ( $uiCode !== $wgLanguageCode && $proposed && $proposed->exists() ) { + if ( $uiCode !== $this->getConfig()->get( 'LanguageCode' ) && $proposed && $proposed->exists() ) { return $proposed; } elseif ( $provided && $provided->exists() ) { return $provided;