Bug 19413: (follow-up) Changed fieldset id value

[koha.git] / changelanguage.pl

diff --git a/changelanguage.pl b/changelanguage.pl
index ad616a7..360484c 100755 (executable)
--- a/changelanguage.pl
+++ b/changelanguage.pl
@@ -1,10 +1,31 @@
 #!/usr/bin/perl
 
-use C4::Output;
-use CGI;
+# 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 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-my $query=new CGI;
-my $language=$query->param('language');
-my $url=$query->referer();
+use strict;
+use warnings;
 
-setlanguagecookie($query,$language,$url);
+use C4::Templates;
+use CGI qw ( -utf8 );
+
+my $query    = new CGI;
+my $language = $query->param('language');
+my $url      = $query->referer();
+
+$url =~ s|(.)language=[\w-]*&?|$1|;
+$url =~ s|(&\|\?)$||; # Remove extraneous ? or &
+
+C4::Templates::setlanguagecookie( $query, $language, $url );