From 9093589b23a46c42b8ee6f72be64460d5f221545 Mon Sep 17 00:00:00 2001 From: Liangent Date: Sat, 17 Nov 2012 18:14:21 +0000 Subject: [PATCH] (bug 42030) Include original URL params in variant links Change-Id: Iaedb56445b97ee09bd7fa08c9f23cd147757dee4 --- includes/SkinTemplate.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index dcc37d75bc..4734f5b8ff 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -999,6 +999,12 @@ class SkinTemplate extends Skin { // Gets preferred variant (note that user preference is // only possible for wiki content language variant) $preferred = $pageLang->getPreferredVariant(); + if ( Action::getActionName( $this ) === 'view' ) { + $params = $request->getQueryValues(); + unset( $params['title'] ); + } else { + $params = array(); + } // Loops over each variant foreach( $variants as $code ) { // Gets variant name from language code @@ -1012,7 +1018,7 @@ class SkinTemplate extends Skin { $content_navigation['variants'][] = array( 'class' => ( $code == $preferred ) ? 'selected' : false, 'text' => $varname, - 'href' => $title->getLocalURL( array( 'variant' => $code ) ), + 'href' => $title->getLocalURL( array( 'variant' => $code ) + $params ), 'lang' => $code, 'hreflang' => $code ); -- 2.20.1