summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2013-03-19 15:42:41 -0700
committerIvan Kohler <ivan@freeside.biz>2013-03-19 15:42:41 -0700
commit4ff563bad0dd485262af7994eca593d4320db054 (patch)
tree201dd954f221af5b45e55e28fd0754f3d07e9260
parent12486600a342b8c8e8e670fedc075b064faa90cd (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 5ef760db5..1c023f9cf 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;
@@ -48,7 +48,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);
@@ -68,7 +68,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