summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2016-10-08 19:01:39 +0200
committerGitHub <noreply@github.com>2016-10-08 19:01:39 +0200
commit0d22ef69987f85fca6df9d33f039ffc00a13a5c9 (patch)
tree64cf388bde571b09edf23a6e93f0fdf960513ca9 /Bugzilla
parent81711939d177924266bf988278f93bed046c9798 (diff)
downloadbugzilla-0d22ef69987f85fca6df9d33f039ffc00a13a5c9.tar.gz
bugzilla-0d22ef69987f85fca6df9d33f039ffc00a13a5c9.tar.xz
Bug 1300437 - DateTime::TimeZone::offset_as_string called incorrectly (#19)
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Migrate.pm2
-rw-r--r--Bugzilla/Util.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/Bugzilla/Migrate.pm b/Bugzilla/Migrate.pm
index b23fc5b53..a5b08a20c 100644
--- a/Bugzilla/Migrate.pm
+++ b/Bugzilla/Migrate.pm
@@ -417,7 +417,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 1a867c5ee..78376c6fe 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -607,7 +607,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,
);