]> git.koha-community.org Git - koha.git/commit
Bug 16848: Prevent invalid warning to be carped from output_pref
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 4 Jul 2016 10:53:39 +0000 (11:53 +0100)
committerJulian Maurice <julian.maurice@biblibre.com>
Tue, 23 Aug 2016 15:36:07 +0000 (17:36 +0200)
commit48b1ffc35839e6b35aaad6f9f4e8b45e9e215ebe
treee1ed826bf53fc1de924976ce41db9a8d0f19e080
parentad04bca35e8b228c98baef07363333d097cd75d4
Bug 16848: Prevent invalid warning to be carped from output_pref

From Koha::DateUtils::output_pref:

   $dt = eval { dt_from_string( $str ) } if $str;
   carp "Invalid date '$str' passed to output_pref\n" if $@;

This second line is wrong: if $str does not exist, the first line is not evaluated and $@ could be filled with previous error.

To reproduce:

Then:
  prove t/DateUtils.t
will display:
t/DateUtils.t .. 20/60 Use of uninitialized value $str in concatenation (.) or string at Koha/DateUtils.pm line 217.
Invalid date '' passed to output_pref
 at t/DateUtils.t line 233.
t/DateUtils.t .. ok
All tests successful.
Files=1, Tests=60,  2 wallclock secs ( 0.02 usr  0.00 sys +  1.40 cusr  0.00 csys =  1.42 CPU)
Result: PASS

Test plan:
Without this patch, you should not see the carp

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c31213ba4fab0082c6ad556aae424918b62205d0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit f81c6770054dab1cb4b4a1ccea1b28bd702b412b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Koha/DateUtils.pm