X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=4cbef16844fad3ba04d3627b1c7b8a7fd31e0276;hb=049e49fea3e4a3c7c78d7aebf055936b3cab40c5;hp=23a399e10fe1b37ea23bfbf8e678640faee12b50;hpb=646cb2aa3a79d7b35a1673fc67cdf802e9cba515;p=kivitendo-erp.git diff --git a/SL/Locale.pm b/SL/Locale.pm index 23a399e10..4cbef1684 100644 --- a/SL/Locale.pm +++ b/SL/Locale.pm @@ -364,8 +364,8 @@ sub parse_date { ($yy, $mm, $dd) = ($date =~ /(..)(..)(..)/); } - $dd *= 1; - $mm *= 1; + $_ ||= 0 for ($dd, $mm, $yy); + $_ *= 1 for ($dd, $mm, $yy); $yy = ($yy < 70) ? $yy + 2000 : $yy; $yy = ($yy >= 70 && $yy <= 99) ? $yy + 1900 : $yy; @@ -383,9 +383,12 @@ sub parse_date_to_object { my ($date_str, $time_str) = split m{\s+}, $string, 2; my ($yy, $mm, $dd) = $self->parse_date(\%params, $date_str); - my $millisecond = 0; - my ($hour, $minute, $second) = split m/:/, $time_str; - ($second, $millisecond) = split quotemeta($num_separator), $second, 2; + my ($hour, $minute, $second) = split m/:/, ($time_str || ''); + $second ||= '0'; + + ($second, my $millisecond) = split quotemeta($num_separator), $second, 2; + $_ ||= 0 for ($hour, $minute, $millisecond); + $millisecond = substr $millisecond, 0, 3; $millisecond .= '0' x (3 - length $millisecond);