* Correct generation of RFC 3339 format times for atom/rss feeds. Always use

  gmtime for these since a time zone is not specified.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index f0c37c1e9886544921cba5893cd158bf98d511a3..30b09d1ad260088d540011f10924b5cf4e3a9832 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -315,7 +315,7 @@ sub date_3339 ($) { #{{{
 
        my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
        POSIX::setlocale(&POSIX::LC_TIME, "C");
-       my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", localtime($time));
+       my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));
        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
        return $ret;
 } #}}}

diff --git a/debian/changelog b/debian/changelog
index ba71afbaca4bc170f83a07cbcb351bf2502288bb..fd66e577b35e8d459528fd6a90d21d2713fa65af 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,7 +31,11 @@ ikiwiki (2.7) UNRELEASED; urgency=low
     `git-rev-parse --show-prefix` from all names reported by git-log.
     Patch by Jamey Sharp
 
- -- Joey Hess <joeyh@debian.org>  Tue, 28 Aug 2007 22:15:52 -0400
+  [ Joey Hess ]
+  * Correct generation of RFC 3339 format times for atom/rss feeds. Always use
+    gmtime for these since a time zone is not specified.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 02 Sep 2007 15:25:36 -0400
 
 ikiwiki (2.6.1) unstable; urgency=low
 

diff --git a/doc/bugs/Feeds_get_wrong_timezone..mdwn b/doc/bugs/Feeds_get_wrong_timezone..mdwn
index dd34bbbc6e94f66e0d1b76ea5fdd38d6dda93d1b..87757883d2373d774fac010bd14e607eb95625a7 100644 (file)
--- a/doc/bugs/Feeds_get_wrong_timezone..mdwn
+++ b/doc/bugs/Feeds_get_wrong_timezone..mdwn
@@ -6,3 +6,5 @@ created/modified at 0312 GMT.
 This occurs in both RSS and Atom feeds, but not in the HTML pages (which
 suggests it's not the server at fault, or IkiWiki overall, but rather
 whatever's generating the RSS and Atom is converting timezones wrongly).
+
+> [[done]], I *think* (description was not entirely clear) --[[Joey]]

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index ec855db9f710efaf79a1cbadd6ac6874d0e315ec..a03d91705c1b142a0946d49355bee77f652b808a 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-28 23:01-0400\n"
+"POT-Creation-Date: 2007-08-29 12:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"