summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2013-03-19 15:42:39 -0700
committerIvan Kohler <ivan@freeside.biz>2013-03-19 15:42:39 -0700
commitbe49cf6b227c698d16238d1be6c9c7785fa5870d (patch)
tree2bf7b90c797fd2a951567ef294da37cdf6431f83
parent43c9d84ae27496b56bb79c6304ae94847318af5b (diff)
fix report day selection on daylight savings boundaries, RT#21879
-rw-r--r--FS/FS/Misc/DateTime.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/FS/FS/Misc/DateTime.pm b/FS/FS/Misc/DateTime.pm
index 99ff409..2fff906 100644
--- a/FS/FS/Misc/DateTime.pm
+++ b/FS/FS/Misc/DateTime.pm
@@ -2,8 +2,8 @@ package FS::Misc::DateTime;
use base qw( Exporter );
use vars qw( @EXPORT_OK );
-use POSIX;
use Carp;
+use Time::Local;
use Date::Parse;
use DateTime::Format::Natural;
use FS::Conf;
@@ -49,7 +49,7 @@ sub parse_datetime {
#carp "WARNING: can't parse date: ". $parser->error;
#return '';
#huh, very common, we still need the "partially" (fully enough for our purposes) parsed date.
- $dt->epoch;
+ return $dt->epoch;
}
} else {
return str2time($string, $tz);
@@ -69,7 +69,7 @@ sub day_end {
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
localtime($time);
- mktime(59,59,23,$mday,$mon,$year,$wday,$yday,$isdst);
+ timelocal(59,59,23,$mday,$mon,$year);
}
=back