From: Liangent <liangent@gmail.com>
Date: Sat, 17 Nov 2012 18:14:21 +0000 (+0000)
Subject: (bug 42030) Include original URL params in variant links
X-Git-Tag: 1.31.0-rc.0~20926^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22brouteur%22%2C%28%24id_rubrique%20?a=commitdiff_plain;h=9093589b23a46c42b8ee6f72be64460d5f221545;p=lhc%2Fweb%2Fwiklou.git

(bug 42030) Include original URL params in variant links

Change-Id: Iaedb56445b97ee09bd7fa08c9f23cd147757dee4
---

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
 						);