From dd841c2a5608a42bf39ea13314dc2391d885dcc4 Mon Sep 17 00:00:00 2001 From: Liangent Date: Wed, 14 Aug 2013 16:04:26 +0000 Subject: [PATCH] Don't use $wgVariantArticlePath for variants of non-content languages Currently PathRouter understands variants of $wgContLang only, and it wouldn't be easy to extend it to variants of the given title because at the time of preparing PathRouter for parsing, the title is unknown yet. Bug: 52852 Bug: 52850 Change-Id: I7dcf7dc73e36945e420a66d99329c09c75b17882 --- includes/Title.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/Title.php b/includes/Title.php index 7818742889..734e009e8a 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1441,7 +1441,7 @@ class Title { $url = str_replace( '$1', $dbkey, $wgArticlePath ); wfRunHooks( 'GetLocalURL::Article', array( &$this, &$url ) ); } else { - global $wgVariantArticlePath, $wgActionPaths; + global $wgVariantArticlePath, $wgActionPaths, $wgContLang; $url = false; $matches = array(); @@ -1463,6 +1463,7 @@ class Title { if ( $url === false && $wgVariantArticlePath && + $wgContLang->getCode() === $this->getPageLanguage()->getCode() && $this->getPageLanguage()->hasVariants() && preg_match( '/^variant=([^&]*)$/', $query, $matches ) ) { -- 2.20.1