summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-01-16 02:01:00 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-01-16 02:01:00 -0500
commitba6b8e5e3e3e5f6749623355a93269f16313eb61 (patch)
treeba9b7ba544a3a6f60d63d160506f567074a32d1a
parent194894eb69fc0aaa4cb2182c3b115310e14fbda7 (diff)
* aggregate: Don't let feeds set creation times for pages in the future.
-rw-r--r--IkiWiki/Plugin/aggregate.pm3
-rw-r--r--debian/changelog1
2 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index a2c10ce5c..0da527f25 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -416,7 +416,8 @@ sub add_page (@) { #{{{
# Set the mtime, this lets the build process get the right creation
# time on record for the new page.
- utime $mtime, $mtime, pagefile($guid->{page}) if defined $mtime;
+ utime $mtime, $mtime, pagefile($guid->{page})
+ if defined $mtime && $mtime <= time;
} #}}}
sub htmlescape ($) { #{{{
diff --git a/debian/changelog b/debian/changelog
index feeb7bdc7..72b8a5839 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (2.21) UNRELEASED; urgency=low
* Old versions of git-init don't support --git-dir or GIT_DIR with
--bare. Change ikiwiki-makerepo to use a method that should work with
those older versions too.
+ * aggregate: Don't let feeds set creation times for pages in the future.
-- Joey Hess <joeyh@debian.org> Fri, 11 Jan 2008 15:09:37 -0500