[koha-commits] main Koha release repository branch master updated. v16.05.00-467-gc31213b

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  c31213ba4fab0082c6ad556aae424918b62205d0 (commit)
      from  09d7a47f1fb1c645d0e3ffb93fb88409b3310363 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c31213ba4fab0082c6ad556aae424918b62205d0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 4 11:53:39 2016 +0100

    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 at catalyst.net.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 Koha/DateUtils.pm |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository