Bug 16776: Do not forget external language choice in language switcher

[koha-equinox.git] / changelanguage.pl

diff --git a/changelanguage.pl b/changelanguage.pl
index 9a72f8d..360484c 100755 (executable)
--- a/changelanguage.pl
+++ b/changelanguage.pl
@@ -25,5 +25,7 @@ my $query    = new CGI;
 my $language = $query->param('language');
 my $url      = $query->referer();
 
-#warn "Language : $query // $language // $url";
+$url =~ s|(.)language=[\w-]*&?|$1|;
+$url =~ s|(&\|\?)$||; # Remove extraneous ? or &
+
 C4::Templates::setlanguagecookie( $query, $language, $url );