urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix check for nonexistant content

master
Joey Hess 2008-09-17 18:19:52 -04:00
parent 18d086dde8
commit 914c92c4e1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki/Plugin/aggregate.pm
View File

@ -520,10 +520,10 @@ sub aggregate (@) { #{{{
} }
foreach my $entry ($f->entries) { foreach my $entry ($f->entries) {
my $content=$content=$entry->content; my $content=$content=$entry->content->body;
# atom feeds may have no content, only a summary # atom feeds may have no content, only a summary
if (! defined $content) { if (! defined $content && ref $entry->summary) {
$content=$entry->summary; $content=$entry->summary->body;
} }
add_page( add_page(
@ -531,7 +531,7 @@ sub aggregate (@) { #{{{
copyright => $f->copyright, copyright => $f->copyright,
title => defined $entry->title ? decode_entities($entry->title) : "untitled", title => defined $entry->title ? decode_entities($entry->title) : "untitled",
link => $entry->link, link => $entry->link,
content => defined $content ? $content->body : "", content => defined $content ? $content : "",
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, ctime => $entry->issued ? ($entry->issued->epoch || time) : time,
); );