From 0db33c9c112e7944fd022a423453aee48d9503b4 Mon Sep 17 00:00:00 2001 From: levinse Date: Thu, 5 May 2011 01:02:06 +0000 Subject: [PATCH] fix small bug in last commit for RT12078 --- FS/FS/cdr/freeside_description_default.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FS/FS/cdr/freeside_description_default.pm b/FS/FS/cdr/freeside_description_default.pm index bc4e89f54..400c24b82 100644 --- a/FS/FS/cdr/freeside_description_default.pm +++ b/FS/FS/cdr/freeside_description_default.pm @@ -27,7 +27,8 @@ use FS::cdr; $time =~ /^(\d{1,2}):(\d{1,2}):(\d{1,2}) (AM|PM)$/ or die "unparsable time: $time"; #maybe we shouldn't die... my $hour = $1; - $hour += 12 if $4 eq 'PM'; + $hour += 12 if $4 eq 'PM' && $hour != 12; + $hour = 0 if $4 eq 'AM' && $hour == 12; $cdr->startdate( timelocal($3, $2, $hour ,$tmp_mday, $tmp_mon, $tmp_year) ); -- 2.11.0