[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.09-126-g48b1ffc

[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, 3.22.x has been updated
       via  48b1ffc35839e6b35aaad6f9f4e8b45e9e215ebe (commit)
      from  ad04bca35e8b228c98baef07363333d097cd75d4 (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 48b1ffc35839e6b35aaad6f9f4e8b45e9e215ebe
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>
    (cherry picked from commit c31213ba4fab0082c6ad556aae424918b62205d0)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit f81c6770054dab1cb4b4a1ccea1b28bd702b412b)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

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


hooks/post-receive
-- 
main Koha release repository