aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2013-07-17 16:38:08 -0400
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2013-07-17 16:38:08 -0400
commit97d0c09a18d9c9b1defb3f4849e04e06745000c7 (patch)
treeb8593a751f76690cdcd0c93ad95ec8819f24550f /IkiWiki
parent844710c0dad4e35213ca1b55a660ab6c0a525dd8 (diff)
downloadikiwiki-97d0c09a18d9c9b1defb3f4849e04e06745000c7.tar
ikiwiki-97d0c09a18d9c9b1defb3f4849e04e06745000c7.tar.gz
Show author in addition to feedname, if different.
While here, mollify http://validator.w3.org/feed/ and s/dcterms:creator/dc:creator/g, which happens to make rss2email see and do nice things with authors.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/aggregate.pm4
1 files changed, 4 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 89da5c453..be6e8d476 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -593,6 +593,7 @@ sub aggregate (@) {
feed => $feed,
copyright => $f->copyright,
title => defined $entry->title ? decode_entities($entry->title) : "untitled",
+ author => defined $entry->author ? decode_entities($entry->author) : "",
link => $entry->link,
content => (defined $c && defined $c->body) ? $c->body : "",
guid => defined $entry->id ? $entry->id : time."_".$feed->{name},
@@ -690,6 +691,9 @@ sub write_page ($$$$$) {
}
$template->param(title => $params{title})
if defined $params{title} && length($params{title});
+ $template->param(author => $params{author})
+ if defined $params{author} && length($params{author}
+ && $params{author} ne $feed->{name});
$template->param(content => wikiescape(htmlabs($params{content},
defined $params{base} ? $params{base} : $feed->{feedurl})));
$template->param(name => $feed->{name});