From: Marcel de Rooy Date: Wed, 18 Oct 2017 14:03:57 +0000 (+0200) Subject: Bug 19493: Remove few warnings from circulation.pl X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=4a4b3aa9486e97cd247042d0e13e418570719be0;p=koha.git Bug 19493: Remove few warnings from circulation.pl If you click Submit on the staff home page without entering a cardnumber, you will find these warnings in the log: Problem = a value of override_high_holds has been passed to param without key at /usr/share/koha/masterclone/C4/Templates.pm line 137. Problem = a value of nopermission has been passed to param without key at /usr/share/koha/masterclone/C4/Templates.pm line 137. Use of uninitialized value $val in concatenation (.) or string at /usr/share/koha/masterclone/C4/Templates.pm line 137. Problem = a value of has been passed to param without key at /usr/share/koha/masterclone/C4/Templates.pm line 137. Cause is this call to $template->param: $template->param( CircAutocompl => C4::Context->preference("CircAutocompl"), debarments => GetDebarments({ borrowernumber => $borrowernumber }), todaysdate => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ), has_modifications => $has_modifications, override_high_holds => $override_high_holds, nopermission => scalar $query->param('nopermission'), In this specific case GetDebarments returns undef in list context (empty list), so all items in the list shift one place. Either we should force GetDebarments to return []; or we force scalar context in a construction like this. This patch does the last thing. Note: The calls in memberentry.pl and moremember.pl are not affected. Test plan: [1] Do not apply. Click Submit without cardnumber. Check the log. [2] Apply. Click Submit again without cardnumber. Check log. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart --- diff --git a/circ/circulation.pl b/circ/circulation.pl index 8ca5a78a3c..e46ced1638 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -653,7 +653,7 @@ $template->param( debt_confirmed => $debt_confirmed, SpecifyDueDate => $duedatespec_allow, CircAutocompl => C4::Context->preference("CircAutocompl"), - debarments => GetDebarments({ borrowernumber => $borrowernumber }), + debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }), todaysdate => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ), has_modifications => $has_modifications, override_high_holds => $override_high_holds,