X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=changelanguage.pl;h=360484c5fa58fd2ec7bf56403cfa58f489511d6d;hb=152ce671eca4b5d74329b518d9d71106f4e60c84;hp=9a72f8dcbada23f1a2d4e7c67c39e09cc7ccfe1a;hpb=ba0f84b46c5c565600575ef61d413067c768fa14;p=koha.git

diff --git a/changelanguage.pl b/changelanguage.pl
index 9a72f8dcba..360484c5fa 100755
--- 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 );