Bugzilla – Attachment 161930 Details for
Bug 35518
Call to C4::Context->userenv happens before it's gets populated breaks code logic in circulation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35518: Tidy the moved blocks
Bug-35518-Tidy-the-moved-blocks.patch (text/plain), 1.95 KB, created by
Martin Renvoize (ashimema)
on 2024-02-08 15:57:24 UTC
(
hide
)
Description:
Bug 35518: Tidy the moved blocks
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2024-02-08 15:57:24 UTC
Size:
1.95 KB
patch
obsolete
>From 4810a201ae9248d9afaf3860b5255ac679221ca1 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 8 Feb 2024 15:55:43 +0000 >Subject: [PATCH] Bug 35518: Tidy the moved blocks > >This patch just tidies the moved blocks to get us past the QA script >check. > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > circ/circulation.pl | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > >diff --git a/circ/circulation.pl b/circ/circulation.pl >index f81102aec14..9296d9e642e 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -64,8 +64,8 @@ use List::MoreUtils qw( uniq ); > my $query = CGI->new; > > my $borrowernumber = $query->param('borrowernumber'); >-my $barcodes = []; >-my $barcode = $query->param('barcode'); >+my $barcodes = []; >+my $barcode = $query->param('barcode'); > > > # Barcode given by user could be '0' >@@ -114,8 +114,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user ( > my $override_high_holds = $query->param('override_high_holds'); > my $override_high_holds_tmp = $query->param('override_high_holds_tmp'); > >-my $sessionID = $query->cookie("CGISESSID") ; >-my $session = get_session($sessionID); >+my $sessionID = $query->cookie("CGISESSID"); >+my $session = get_session($sessionID); > > my $userenv = C4::Context->userenv; > my $branch = $userenv->{'branch'} // ''; >@@ -124,10 +124,10 @@ my $desk_id = $userenv->{"desk_id"} || ''; > my $findborrower; > my $autoswitched; > >-if (C4::Context->preference("AutoSwitchPatron") && $barcode) { >+if ( C4::Context->preference("AutoSwitchPatron") && $barcode ) { > my $new_barcode = $barcode; > Koha::Plugins->call( 'patron_barcode_transform', \$new_barcode ); >- if (Koha::Patrons->search( { cardnumber => $new_barcode} )->count() > 0) { >+ if ( Koha::Patrons->search( { cardnumber => $new_barcode } )->count() > 0 ) { > $findborrower = $barcode; > undef $barcode; > undef $borrowernumber; >-- >2.43.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35518
:
161539
|
161707
|
161929
| 161930 |
162216
|
162218