From 821ed63ce005309be2ae99fc222d360930dad2cb Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 18 Apr 2017 13:50:36 -0300 Subject: [PATCH] Bug 18179: Update existing calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch updates the existing occurrences of ->find called in a list context. There are certainly others that are not easy to catch with git grep. Test plan: Confirm that the 4 modified scripts still works as expected. We need this one ASAP in master to make sure we will not get other side-effects of this kind and to catch possible uncaught occurrences before the release. Tested scripts changed by this patch, they work as expected. Signed-off-by: Marc VĂ©ron Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart --- members/memberentry.pl | 2 +- members/moremember.pl | 2 +- members/pay.pl | 4 ++-- opac/opac-user.pl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/members/memberentry.pl b/members/memberentry.pl index 768b163..c13faa5 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -753,7 +753,7 @@ $template->param( csrf_token => # HouseboundModule data $template->param( - housebound_role => Koha::Patron::HouseboundRoles->find($borrowernumber), + housebound_role => scalar Koha::Patron::HouseboundRoles->find($borrowernumber), ); if(defined($data{'flags'})){ diff --git a/members/moremember.pl b/members/moremember.pl index 2ab8174..20044a6 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -347,7 +347,7 @@ $template->param( is_child => ($category_type eq 'C'), samebranch => $samebranch, quickslip => $quickslip, - housebound_role => $patron->housebound_role, + housebound_role => scalar $patron->housebound_role, privacy_guarantor_checkouts => $data->{'privacy_guarantor_checkouts'}, AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'), SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'), diff --git a/members/pay.pl b/members/pay.pl index 2e25eef..3400ee0 100755 --- a/members/pay.pl +++ b/members/pay.pl @@ -94,7 +94,7 @@ if ($writeoff_all) { Koha::Account->new( { patron_id => $borrowernumber } )->pay( { amount => $amount, - lines => [Koha::Account::Lines->find($accountlines_id)], + lines => [ scalar Koha::Account::Lines->find($accountlines_id) ], type => 'writeoff', note => $payment_note, library_id => $branch, @@ -208,7 +208,7 @@ sub writeoff_all { Koha::Account->new( { patron_id => $borrowernumber } )->pay( { amount => $amount, - lines => [ Koha::Account::Lines->find($accountlines_id) ], + lines => [ scalar Koha::Account::Lines->find($accountlines_id) ], type => 'writeoff', note => $payment_note, library_id => $branch, diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 6ae7b9a..b8714b1 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -343,7 +343,7 @@ if ( C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor' } $template->param( - borrower => Koha::Patrons->find($borrowernumber), + borrower => scalar Koha::Patrons->find($borrowernumber), patron_messages => $patron_messages, opacnote => $borr->{opacnote}, patronupdate => $patronupdate, -- 2.9.3