diff options
| author | fukachan <fukachan> | 2018-01-13 08:28:07 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2018-01-13 08:28:07 +0000 |
| commit | e3bbbb414877eda5572520a8d3223bf6967d03a1 (patch) | |
| tree | cf55658552a3e9f1b0b94c909014466b3f88fc0b | |
| parent | 2738d7ee0f0a92c29fd4e8640326822f7fc0e169 (diff) | |
| download | fml8-e3bbbb414877eda5572520a8d3223bf6967d03a1.tar.gz fml8-e3bbbb414877eda5572520a8d3223bf6967d03a1.tar.bz2 fml8-e3bbbb414877eda5572520a8d3223bf6967d03a1.zip | |
resolv conflicts, bump up to Time-modules-2013-0912.
| -rw-r--r-- | cpan/lib/Time/ParseDate.pm | 2 | ||||
| -rw-r--r-- | cpan/lib/Time/Timezone.pm | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/cpan/lib/Time/ParseDate.pm b/cpan/lib/Time/ParseDate.pm index c46b7323..c9a149b3 100644 --- a/cpan/lib/Time/ParseDate.pm +++ b/cpan/lib/Time/ParseDate.pm @@ -17,7 +17,7 @@ use strict; # constants use vars qw(%mtable %umult %wdays $VERSION); -$VERSION = 2011.0517; +$VERSION = 2013.0912; # globals use vars qw($debug); diff --git a/cpan/lib/Time/Timezone.pm b/cpan/lib/Time/Timezone.pm index d5af6111..8b0b8cd6 100644 --- a/cpan/lib/Time/Timezone.pm +++ b/cpan/lib/Time/Timezone.pm @@ -62,18 +62,8 @@ sub tz_local_offset my ($time) = @_; $time = time() unless $time; - my (@l) = localtime($time); - my $isdst = $l[8] || 0; - my $tzenv = defined($ENV{TZ}) ? $ENV{TZ} : "__notz"; - - if ($Timezone::tz_local{$tzenv} && - defined($Timezone::tz_local{$tzenv}[$isdst])) { - return $Timezone::tz_local{$tzenv}[$isdst]; - } - - $Timezone::tz_local{$tzenv}[$isdst] = &calc_off($time); - return $Timezone::tz_local{$tzenv}[$isdst]; + return &calc_off($time); } sub calc_off |