X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e4ccc4f3b09aaaa4f64bdba1d6ffff24e924fd20..819b31d46c05c00d4183f824f74bfe3836471d78:/IkiWiki/Plugin/inline.pm?ds=inline

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 110410abc..71e71c02e 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -35,6 +35,9 @@ sub preprocess_inline (@) { #{{{
 	if (! exists $params{show} && $params{archive} eq "no") {
 		$params{show}=10;
 	}
+	if (! exists $params{rss}) {
+		$params{rss}="yes";
+	}
 
 	# Avoid nested inlines, to avoid loops etc.
 	if ($processing_inline) {
@@ -45,7 +48,7 @@ sub preprocess_inline (@) { #{{{
 	my @list;
 	foreach my $page (keys %pagesources) {
 		next if $page eq $params{page};
-		if (globlist_match($page, $params{pages})) {
+		if (pagespec_match($page, $params{pages})) {
 			push @list, $page;
 		}
 	}
@@ -68,7 +71,7 @@ sub preprocess_inline (@) { #{{{
 		}
 		$ret.=$formtemplate->output;
 	}
-	elsif ($config{rss}) {
+	elsif ($config{rss} && $params{rss} eq "yes") {
 		# Add a rss link button.
 		my $linktemplate=template("rsslink.tmpl", blind_cache => 1);
 		$linktemplate->param(rssurl => rsspage(basename($params{page})));
@@ -105,7 +108,7 @@ sub preprocess_inline (@) { #{{{
 	# TODO: should really add this to renderedfiles and call
 	# check_overwrite, but currently renderedfiles
 	# only supports listing one file per page.
-	if ($config{rss}) {
+	if ($config{rss} && $params{rss} eq "yes") {
 		writefile(rsspage($params{page}), $config{destdir},
 			genrss($params{page}, @list));
 		$toping{$params{page}}=1 unless $config{rebuild};
@@ -170,6 +173,7 @@ sub genrss ($@) { #{{{
 		$itemtemplate->param(
 			title => pagetitle(basename($p)),
 			url => "$config{url}/$renderedfiles{$p}",
+			permalink => "$config{url}/$renderedfiles{$p}",
 			pubdate => date_822($pagectime{$p}),
 			content => absolute_urls(get_inline_content($p, $page), $url),
 		);
@@ -177,6 +181,7 @@ sub genrss ($@) { #{{{
 			shift->(page => $p, destpage => $page,
 				template => $itemtemplate);
 		});
+
 		$content.=$itemtemplate->output;
 		$itemtemplate->clear_params;
 	}
@@ -188,7 +193,6 @@ sub genrss ($@) { #{{{
 		pageurl => $url,
 		content => $content,
 	);
-	
 	run_hooks(pagetemplate => sub {
 		shift->(page => $page, destpage => $page,
 			template => $template);