Don't use $wgVariantArticlePath when the main language code is specified as a paramet...

diff --git a/includes/Title.php b/includes/Title.php
index 09d68b2..700f7e6 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -826,6 +826,9 @@ class Title {
                        $pref = $wgContLang->getPreferredVariant(false);
                        if($pref != $wgContLang->getCode())
                                $variant = $pref;
+               } elseif ( $variant == $wgContLang->getCode() ) {
+                       // Don't use $wgVariantArticlePath for the main code
+                       $variant = false;
                }
 
                if ( $this->isExternal() ) {