diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2016-10-08 10:01:39 -0700 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2016-10-08 13:06:50 -0400 |
| commit | adcfe9f154e6751b842ba930de5300fe72214e4e (patch) | |
| tree | a82226ab31930e1abe4319b962e02836040bb00a | |
| parent | fe2251f5ddef052e7d529fc5a8b7d42e3e086b98 (diff) | |
| download | bugs-adcfe9f154e6751b842ba930de5300fe72214e4e.tar bugs-adcfe9f154e6751b842ba930de5300fe72214e4e.tar.gz bugs-adcfe9f154e6751b842ba930de5300fe72214e4e.tar.bz2 bugs-adcfe9f154e6751b842ba930de5300fe72214e4e.tar.xz bugs-adcfe9f154e6751b842ba930de5300fe72214e4e.zip | |
Bug 1300437 - DateTime::TimeZone::offset_as_string called incorrectly (#19)
| -rw-r--r-- | Bugzilla/Migrate.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Util.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Bugzilla/Migrate.pm b/Bugzilla/Migrate.pm index 0731d4fed..148567d86 100644 --- a/Bugzilla/Migrate.pm +++ b/Bugzilla/Migrate.pm @@ -403,7 +403,7 @@ sub parse_date { } my $tz; if ($time[6]) { - $tz = Bugzilla->local_timezone->offset_as_string($time[6]); + $tz = DateTime::TimeZone->local_timezone->offset_as_string($time[6]); } else { $tz = $self->config('timezone'); diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm index bbf4261ca..5fe64621b 100644 --- a/Bugzilla/Util.pm +++ b/Bugzilla/Util.pm @@ -588,7 +588,7 @@ sub datetime_from { second => defined($time[0]) ? int($time[0]) : undef, # If a timezone was specified, use it. Otherwise, use the # local timezone. - time_zone => Bugzilla->local_timezone->offset_as_string($time[6]) + time_zone => DateTime::TimeZone->offset_as_string($time[6]) || Bugzilla->local_timezone, ); |