Attachment 66734 Details for Bug 18946 – Bug 18946 [QA Followup] - code cleanup

[patch] Bug 18946 [QA Followup] - code cleanup

Bug-18946-QA-Followup---code-cleanup.patch (text/plain), 1.68 KB, created by Kyle M Hall (khall) on 2017-09-01 13:08:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2017-09-01 13:08:54 UTC

Size: 1.68 KB

patch

obsolete

>From 061aee96a5ac29dc029f0b90f4bf5cb2a629b6f3 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Fri, 1 Sep 2017 08:41:51 -0400
>Subject: [PATCH] Bug 18946 [QA Followup] - code cleanup
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> opac/opac-changelanguage.pl | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
>diff --git a/opac/opac-changelanguage.pl b/opac/opac-changelanguage.pl
>index 689f4d4..133e58e 100755
>--- a/opac/opac-changelanguage.pl
>+++ b/opac/opac-changelanguage.pl
>@@ -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 );
>-- 
>2.10.2

Actions: View | Diff | Splinter Review

Attachments on bug 18946: 65089 | 66719 | 66720 | 66733 | 66734