Bug 28941: Filter suggestion inputs at the OPAC

[srvgit] / opac / opac-changelanguage.pl

diff --git a/opac/opac-changelanguage.pl b/opac/opac-changelanguage.pl
index 689f4d4..eb1c296 100755 (executable)
--- a/opac/opac-changelanguage.pl
+++ b/opac/opac-changelanguage.pl
@@ -15,24 +15,13 @@
 # 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 Modern::Perl;
 use CGI qw ( -utf8 );
+use C4::Templates;
+use Koha::Util::Navigation;
 
-my $query    = new CGI;
+my $query = CGI->new;
 my $language = $query->param('language');
-# Detect where the user came from and save that url
-my $requestedUrl = $query->url(-base => 1) ;
-# Use referer url if it matches $requestedUrl else use $requestedUrl as the url .
-my $url = $query->referer()=~$requestedUrl  ? $query->referer()  : $requestedUrl;
-
-# warn "Language : $query // $language // $url";
-
-# If language was set by an external URL the parameter
-# 'language=' should be removed from url string, otherwise
-# the language picker will not work
-$url =~ s|(.)language=[\w-]*&?|$1|;
-$url =~ s|(&\|\?)$||; # Remove extraneous ? or &
+my $url = Koha::Util::Navigation::local_referer($query, { remove_language => 1 });
 
 C4::Templates::setlanguagecookie( $query, $language, $url );