X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=changelanguage.pl;h=360484c5fa58fd2ec7bf56403cfa58f489511d6d;hb=f839955db707415368d23ae81bdb14505dd058ee;hp=c4d68e37a42658c45e784cb43c8c5d0d00f06da3;hpb=c0234dd9b9649063acf2617fecf5c6efda38a532;p=koha.git

diff --git a/changelanguage.pl b/changelanguage.pl
index c4d68e37a4..360484c5fa 100755
--- a/changelanguage.pl
+++ b/changelanguage.pl
@@ -2,28 +2,30 @@
 
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
 
 use C4::Templates;
-use CGI;
+use CGI qw ( -utf8 );
 
 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 );