From f88d0f1cff5a07a9a082194ddc6a57c536d72e88 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Fri, 3 Jul 2015 18:04:04 -0400 Subject: [PATCH] Bug 14487: Noise best detected under Debian 8 The first error is caused by the fact that $messages->{'IsPermanent'} is undefined. The second error is caused by querying the CGI parameter 'barcode' inside a function call. This is not required. There is a variable $barcode set with the parameter. Changed to use the variable. TEST PLAN ---------- 1) Test first patch. 2) Clear the log 3) Put in a barcode which is not checked out. 4) Check the log. -- should be two errors. One about a hash, the other will only be detectable under Debian 8. 5) Apply this second patch 6) Clear the log 7) Put in a barcode which is not checked out. 8) Check the log. -- should be empty. 9) run koha qa test tools Signed-off-by: Indranil Das Gupta (L2C2 Technologies) Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi (cherry picked from commit beef8534724900e5777fc7b6d163763712decb1f) Signed-off-by: Chris Cormack --- circ/returns.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/circ/returns.pl b/circ/returns.pl index 304e8012c3..955b7b4938 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -462,7 +462,8 @@ foreach my $code ( keys %$messages ) { } elsif ( $code eq 'NotIssued' ) { $err{notissued} = 1; - $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'}; + $err{msg} = ''; + $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'} if $messages->{'IsPermanent'}; } elsif ( $code eq 'LocalUse' ) { $err{localuse} = 1; @@ -613,7 +614,7 @@ $template->param( BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"), ); -$itemnumber = GetItemnumberFromBarcode( $query->param('barcode') ); +$itemnumber = GetItemnumberFromBarcode( $barcode ); if ( $itemnumber ) { my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber ); $holdingBranch //= ''; -- 2.39.5