diff options
| author | lpsolit%gmail.com <> | 2007-02-10 08:06:22 +0100 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2007-02-10 08:06:22 +0100 |
| commit | 25f6509fe6d2e3adea4cb2ead7265e3a2d1536b7 (patch) | |
| tree | fe701e1b90b069f7a13ba070110f7b16f0c62af5 | |
| parent | be11b7c3a55ba11c683d1e813fb0c4a1be0ae70d (diff) | |
| download | bugzilla-25f6509fe6d2e3adea4cb2ead7265e3a2d1536b7.tar.gz bugzilla-25f6509fe6d2e3adea4cb2ead7265e3a2d1536b7.tar.xz | |
Bug 369912: Buglists exported as iCalendar have wrong timestamps - Patch by Frédéric Buclin <LpSolit@gmail.com> r=myk a=LpSolit
| -rwxr-xr-x | buglist.cgi | 4 | ||||
| -rw-r--r-- | template/en/default/list/list.ics.tmpl | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/buglist.cgi b/buglist.cgi index 7181c2199..122a917de 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -1018,13 +1018,13 @@ while (my @row = $buglist_sth->fetchrow_array()) { # Put in the change date as a time, so that the template date plugin # can format the date in any way needed by the template. ICS and Atom # have specific, and different, date and time formatting. - $bug->{'changedtime'} = str2time($bug->{'changeddate'}); + $bug->{'changedtime'} = str2time($bug->{'changeddate'}, Bugzilla->params->{'timezone'}); $bug->{'changeddate'} = DiffDate($bug->{'changeddate'}); } if ($bug->{'opendate'}) { # Put in the open date as a time for the template date plugin. - $bug->{'opentime'} = str2time($bug->{'opendate'}); + $bug->{'opentime'} = str2time($bug->{'opendate'}, Bugzilla->params->{'timezone'}); $bug->{'opendate'} = DiffDate($bug->{'opendate'}); } diff --git a/template/en/default/list/list.ics.tmpl b/template/en/default/list/list.ics.tmpl index f857d30b6..814a397aa 100644 --- a/template/en/default/list/list.ics.tmpl +++ b/template/en/default/list/list.ics.tmpl @@ -18,7 +18,7 @@ # # Contributor(s): William Jon McCann <mccann@jhu.edu> #%] -[% PROCESS global/variables.none.tmpl %][% USE date %] +[% PROCESS global/variables.none.tmpl %] BEGIN:VCALENDAR CALSCALE:GREGORIAN [%+ PROCESS ics_prodid +%] @@ -32,7 +32,7 @@ BEGIN:VTODO [%+ PROCESS ics_status bug_status = bug.bug_status +%] [%+ PROCESS ics_dtstamp +%] [% IF bug.changeddate %] -[%+ date.format(bug.changedtime,"%Y%m%dT%H%M%SZ") FILTER ics('LAST-MODIFIED') +%] +[%+ time2str("%Y%m%dT%H%M%SZ", bug.changedtime, "UTC") FILTER ics('LAST-MODIFIED') +%] [% END %] [% IF bug.percentage_complete %] [%+ bug.percentage_complete FILTER format('%d') FILTER ics('PERCENT-COMPLETE') +%] @@ -66,11 +66,11 @@ END:VCALENDAR [% END %] [% BLOCK ics_dtstart %] - [% date.format(bug.opentime,"%Y%m%dT%H%M%SZ") FILTER ics('DTSTART') %] + [% time2str("%Y%m%dT%H%M%SZ", bug.opentime, "UTC") FILTER ics('DTSTART') %] [% END %] [% BLOCK ics_dtstamp %] - [% date.format(date.now,"%Y%m%dT%H%M%SZ") FILTER ics('DTSTAMP') %] + [% time2str("%Y%m%dT%H%M%SZ", currenttime, "UTC") FILTER ics('DTSTAMP') %] [% END %] [% BLOCK ics_status %] |