summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorghendricks%novell.com <>2009-04-11 00:29:58 +0200
committerghendricks%novell.com <>2009-04-11 00:29:58 +0200
commit0e4b2ce5a8e14a95d0eac6776731bcb37fec2741 (patch)
tree5e373275b91b4822feb1ba79f6f671ca045c0692 /Bugzilla
parent114db9a8388cfda7f293a2ac3354ad39818f3488 (diff)
downloadbugzilla-0e4b2ce5a8e14a95d0eac6776731bcb37fec2741.tar.gz
bugzilla-0e4b2ce5a8e14a95d0eac6776731bcb37fec2741.tar.xz
Bug 486006 - importxml.pl must not use format_time() for deadlines
patch by ghendricks r=LpSolit a=LpSolit
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Util.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 7ed20c875..a725a8e21 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -445,8 +445,10 @@ sub format_time {
hour => $time[2],
minute => $time[1],
second => $time[0],
- # Use the timezone specified by the server.
- time_zone => Bugzilla->local_timezone});
+ # If importing, use the specified timezone, otherwise
+ # use the timezone specified by the server.
+ time_zone => Bugzilla->local_timezone->offset_as_string($time[6])
+ || Bugzilla->local_timezone});
# Now display the date using the given timezone,
# or the user's timezone if none is given.