diff options
| author | fukachan <fukachan> | 2018-01-13 08:25:23 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2018-01-13 08:25:23 +0000 |
| commit | 2738d7ee0f0a92c29fd4e8640326822f7fc0e169 (patch) | |
| tree | 98b92d943bc02458ba0efa6400807796509a0bad | |
| parent | 333002c1699c03d8fe5747901862b9bb9daba6ee (diff) | |
| download | fml8-2738d7ee0f0a92c29fd4e8640326822f7fc0e169.tar.gz fml8-2738d7ee0f0a92c29fd4e8640326822f7fc0e169.tar.bz2 fml8-2738d7ee0f0a92c29fd4e8640326822f7fc0e169.zip | |
resolv conflict. bump up to Time-modules-2013.0912.
| -rw-r--r-- | cpan/dist/Time-modules/CHANGELOG | 3 | ||||
| -rw-r--r-- | cpan/dist/Time-modules/MANIFEST | 1 | ||||
| -rw-r--r-- | cpan/dist/Time-modules/lib/Time/ParseDate.pm | 2 | ||||
| -rw-r--r-- | cpan/dist/Time-modules/lib/Time/Timezone.pm | 12 |
4 files changed, 6 insertions, 12 deletions
diff --git a/cpan/dist/Time-modules/CHANGELOG b/cpan/dist/Time-modules/CHANGELOG index c0847f25..dbc5e54f 100644 --- a/cpan/dist/Time-modules/CHANGELOG +++ b/cpan/dist/Time-modules/CHANGELOG @@ -1,3 +1,6 @@ +2013.0912: + Pulled fix from Adam Schobelock that removes timezone offset + caching because it was creating incorrect behavor or Moscow. 2011.0517: Bugfix from Sophie Hamilton: call tzset() when changing timezones. diff --git a/cpan/dist/Time-modules/MANIFEST b/cpan/dist/Time-modules/MANIFEST index 040e4a44..573b1ef2 100644 --- a/cpan/dist/Time-modules/MANIFEST +++ b/cpan/dist/Time-modules/MANIFEST @@ -12,3 +12,4 @@ t/metdate.t t/order1.t t/order2.t META.yml Module meta-data (added by MakeMaker) +META.json Module JSON meta-data (added by MakeMaker) diff --git a/cpan/dist/Time-modules/lib/Time/ParseDate.pm b/cpan/dist/Time-modules/lib/Time/ParseDate.pm index c46b7323..c9a149b3 100644 --- a/cpan/dist/Time-modules/lib/Time/ParseDate.pm +++ b/cpan/dist/Time-modules/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/dist/Time-modules/lib/Time/Timezone.pm b/cpan/dist/Time-modules/lib/Time/Timezone.pm index d5af6111..8b0b8cd6 100644 --- a/cpan/dist/Time-modules/lib/Time/Timezone.pm +++ b/cpan/dist/Time-modules/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 |