X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e8b39b094116e8b50cf12fe56b9c6a04f05683e5..831190e1f356a6e1b7b872786e6d07f9c747ea33:/IkiWiki/Plugin/aggregate.pm?ds=inline

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index d6592fef3..41c25fe26 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -289,14 +289,14 @@ sub add_page (@) { #{{{
 	$template->param(title => $params{title})
 		if defined $params{title} && length($params{title});
 	$template->param(content => htmlescape(htmlabs($params{content}, $feed->{feedurl})));
-	$template->param(url => $feed->{url});
 	$template->param(name => $feed->{name});
-	$template->param(link => urlabs($params{link}, $feed->{feedurl}))
+	$template->param(url => $feed->{url});
+	$template->param(permalink => urlabs($params{link}, $feed->{feedurl}))
 		if defined $params{link};
 	if (ref $feed->{tags}) {
 		$template->param(tags => [map { tag => $_ }, @{$feed->{tags}}]);
 	}
-	IkiWiki::writefile($guid->{page}.".html", $IkiWiki::config{srcdir},
+	IkiWiki::writefile(IkiWiki::htmlpage($guid->{page}), $IkiWiki::config{srcdir},
 		$template->output);
 
 	# Set the mtime, this lets the build process get the right creation
@@ -371,7 +371,7 @@ sub remove_feeds () { #{{{
 sub pagefile ($) { #{{{
 	my $page=shift;
 
-	return "$IkiWiki::config{srcdir}/$page.html";
+	return "$IkiWiki::config{srcdir}/".IkiWiki::htmlpage($page);
 } #}}}
 
 1