diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-04-03 02:36:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-04-03 02:36:01 -0400 |
| commit | de8c34df59891dd06bb79777536bc9a92f919b0a (patch) | |
| tree | 51845f0608e65bbb721fc0c1ba9d78d0e1dbd664 | |
| parent | abb432ff4c00af75e6e4b83087012090b57f51ab (diff) | |
aggregate: Correct a mistake in the code that dummy up a guid for feeds lacking one.
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 942dbbcc3..cb165acd2 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -404,7 +404,7 @@ sub aggregate (@) { #{{{ title => defined $entry->title ? decode_entities($entry->title) : "untitled", link => $entry->link, content => defined $entry->content->body ? $entry->content->body : "", - guid => defined $entry->id ? $entry->id : time."_".$feed->name, + guid => defined $entry->id ? $entry->id : time."_".$feed->{name}, ctime => $entry->issued ? ($entry->issued->epoch || time) : time, ); } diff --git a/debian/changelog b/debian/changelog index d4a1f2471..eed7940fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (2.42) UNRELEASED; urgency=low + + * aggregate: Correct a mistake in the code that dummy up a guid for feeds + lacking one. + + -- Joey Hess <joeyh@debian.org> Thu, 03 Apr 2008 02:35:39 -0400 + ikiwiki (2.41) unstable; urgency=low [ Adeodato Simó ] |