From: ghendricks%novell.com <>
Date: Fri, 10 Apr 2009 22:28:43 +0000 (+0000)
Subject:  Bug 486006 -  importxml.pl must not use format_time() for deadlines
X-Git-Tag: bugzilla-3.4rc1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ba61de93c4f21c2171f25217f14e49b486f6772;p=thirdparty%2Fbugzilla.git

 Bug 486006 -  importxml.pl must not use format_time() for deadlines
 patch by ghendricks r=LpSolit a=LpSolit
---

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 7ed20c8752..a725a8e21f 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.
diff --git a/importxml.pl b/importxml.pl
index 0a6aefe45b..bd4aee186c 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -87,7 +87,6 @@ use Bugzilla::Status;
 
 use MIME::Base64;
 use MIME::Parser;
-use Date::Format;
 use Getopt::Long;
 use Pod::Usage;
 use XML::Twig;
@@ -803,8 +802,7 @@ sub process_bug {
 
     # Process time fields
     if ( $params->{"timetrackinggroup"} ) {
-        my $date = format_time( $bug_fields{'deadline'}, "%Y-%m-%d" )
-          || undef;
+        my $date = validate_date( $bug_fields{'deadline'} ) ? $bug_fields{'deadline'} : undef;
         push( @values, $date );
         push( @query,  "deadline" );
         if ( defined $bug_fields{'estimated_time'} ) {