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

aggregate: Try to query XML::Feed for the base url when derelevatising links. Since this needs the just released XML::Feed 0.3, as well as a not yet released XML::RSS, it will fall back to the old method if no xml:base info is available.

master
Joey Hess 2008-11-06 16:05:10 -05:00
parent 3689d28f3a
commit ecf2399f4f
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IkiWiki/Plugin/aggregate.pm
View File

@ -520,10 +520,10 @@ sub aggregate (@) { #{{{
}
foreach my $entry ($f->entries) {
my $content=$content=$entry->content->body;
my $c=$entry->content;
# atom feeds may have no content, only a summary
if (! defined $content && ref $entry->summary) {
$content=$entry->summary->body;
if (! defined $c && ref $entry->summary) {
$c=$entry->summary;
}
add_page(
@ -531,9 +531,10 @@ sub aggregate (@) { #{{{
copyright => $f->copyright,
title => defined $entry->title ? decode_entities($entry->title) : "untitled",
link => $entry->link,
content => defined $content ? $content : "",
content => defined $c ? $c->body : "",
guid => defined $entry->id ? $entry->id : time."_".$feed->{name},
ctime => $entry->issued ? ($entry->issued->epoch || time) : time,
base => (defined $c && $c->can("base")) ? $c->base : undef,
);
}
}
@ -605,7 +606,8 @@ sub add_page (@) { #{{{
my $template=template($feed->{template}, blind_cache => 1);
$template->param(title => $params{title})
if defined $params{title} && length($params{title});
$template->param(content => htmlescape(htmlabs($params{content}, $feed->{feedurl})));
$template->param(content => htmlescape(htmlabs($params{content},
defined $params{base} ? $params{base} : $feed->{feedurl})));
$template->param(name => $feed->{name});
$template->param(url => $feed->{url});
$template->param(copyright => $params{copyright})

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
ikiwiki (2.69) UNRELEASED; urgency=low
* aggregate: Try to query XML::Feed for the base url when derelevatising
links. Since this needs the just released XML::Feed 0.3, as well
as a not yet released XML::RSS, it will fall back to the old method
if no xml:base info is available.
-- Joey Hess <joeyh@debian.org> Thu, 06 Nov 2008 16:01:00 -0500
ikiwiki (2.68) unstable; urgency=low
* Add support for checking pushes from untrusted git committers. This can be