Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "(bug 42030) Include original URL params in variant links"

Browse source
This commit is contained in:
jenkins-bot 2013-01-24 23:16:46 +00:00 committed by Gerrit Code Review
commit e1e5dab050
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/SkinTemplate.php
View file

@ -1008,6 +1008,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
@ -1021,7 +1027,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
);