Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 18946 [QA Followup] - code cleanup

Browse source 
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Kyle Hall 2017-09-01 08:41:51 -04:00 committed by Jonathan Druart
parent 48f54016a7
commit f1b0dae9a6
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
opac/opac-changelanguage.pl
View file

@ -15,17 +15,20 @@
# 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 Modern::Perl;
use C4::Templates;
use CGI qw ( -utf8 );
my $query = new CGI;
my $language = $query->param('language');
# Detect where the user came from and save that url
my $requestedUrl = $query->url(-base => 1) ;
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;
my $url =
$query->referer() =~ $requestedUrl ? $query->referer() : $requestedUrl;
# warn "Language : $query // $language // $url";
@ -33,6 +36,6 @@ my $url = $query->referer()=~$requestedUrl ? $query->referer() : $requestedUrl
# 'language=' should be removed from url string, otherwise
# the language picker will not work
$url =~ s|(.)language=[\w-]*&?|$1|;
$url =~ s|(&\|\?)$||; # Remove extraneous ? or &
$url =~ s|(&\|\?)$||; # Remove extraneous ? or &
C4::Templates::setlanguagecookie( $query, $language, $url );