Merge "Avoid unstubbing $wgLang in Title::getLocalURL"

diff --git a/includes/Title.php b/includes/Title.php
index 876afe6..25fbce3 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1713,9 +1713,9 @@ class Title implements LinkTarget {
 
                                if ( $url === false
                                        && $wgVariantArticlePath
+                                       && preg_match( '/^variant=([^&]*)$/', $query, $matches )
                                        && $wgContLang->getCode() === $this->getPageLanguage()->getCode()
                                        && $this->getPageLanguage()->hasVariants()
-                                       && preg_match( '/^variant=([^&]*)$/', $query, $matches )
                                ) {
                                        $variant = urldecode( $matches[1] );
                                        if ( $this->getPageLanguage()->hasVariant( $variant ) ) {