X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b0e7e2e123079a2e68924cfb90d19c44571b1f65..429c13f47626098e7d3f4e586c87cf8c433490b7:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 6bcd59a9f..08126c4e6 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -34,14 +34,26 @@ sub preprocess_inline (@) { #{{{
 	if (! exists $params{show} && $params{archive} eq "no") {
 		$params{show}=10;
 	}
+
+	my @list;
+	foreach my $page (keys %pagesources) {
+		next if $page eq $params{page};
+		if (globlist_match($page, $params{pages})) {
+			push @list, $page;
+		}
+	}
+	@list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
+	if ($params{show} && @list > $params{show}) {
+		@list=@list[0..$params{show} - 1];
+	}
+
 	add_depends($params{page}, $params{pages});
 
 	my $ret="";
 	
 	if (exists $params{rootpage}) {
 		# Add a blog post form, with a rss link button.
-		my $formtemplate=HTML::Template->new(blind_cache => 1,
-			filename => "$config{templatedir}/blogpost.tmpl");
+		my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
 		$formtemplate->param(cgiurl => $config{cgiurl});
 		$formtemplate->param(rootpage => $params{rootpage});
 		if ($config{rss}) {
@@ -51,21 +63,19 @@ sub preprocess_inline (@) { #{{{
 	}
 	elsif ($config{rss}) {
 		# Add a rss link button.
-		my $linktemplate=HTML::Template->new(blind_cache => 1,
-			filename => "$config{templatedir}/rsslink.tmpl");
+		my $linktemplate=template("rsslink.tmpl", blind_cache => 1);
 		$linktemplate->param(rssurl => rsspage(basename($params{page})));
 		$ret.=$linktemplate->output;
 	}
 	
-	my $template=HTML::Template->new(blind_cache => 1,
-		filename => (($params{archive} eq "no") 
-				? "$config{templatedir}/inlinepage.tmpl"
-				: "$config{templatedir}/inlinepagetitle.tmpl"));
+	my $template=template(
+		(($params{archive} eq "no")
+			? "inlinepage.tmpl"
+			: "inlinepagetitle.tmpl"),
+		blind_cache => 1,
+	);
 	
-	my @pages;
-	foreach my $page (blog_list($params{pages}, $params{show})) {
-		next if $page eq $params{page};
-		push @pages, $page;
+	foreach my $page (@list) {
 		$template->param(pagelink => htmllink($params{page}, $params{page}, $page));
 		$template->param(content => get_inline_content($params{page}, $page))
 			if $params{archive} eq "no";
@@ -78,36 +88,20 @@ sub preprocess_inline (@) { #{{{
 	# only supports listing one file per page.
 	if ($config{rss}) {
 		writefile(rsspage($params{page}), $config{destdir},
-			genrss($params{page}, @pages));
-		$toping{$params{page}}=1;
+			genrss($params{page}, @list));
+		$toping{$params{page}}=1 unless $config{rebuild};
 	}
 	
 	return $ret;
 } #}}}
 
-sub blog_list ($$) { #{{{
-	my $globlist=shift;
-	my $maxitems=shift;
-
-	my @list;
-	foreach my $page (keys %pagesources) {
-		if (globlist_match($page, $globlist)) {
-			push @list, $page;
-		}
-	}
-
-	@list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
-	return @list if ! $maxitems || @list <= $maxitems;
-	return @list[0..$maxitems - 1];
-} #}}}
-
 sub get_inline_content ($$) { #{{{
 	my $parentpage=shift;
 	my $page=shift;
 	
 	my $file=$pagesources{$page};
 	my $type=pagetype($file);
-	if ($type ne 'unknown') {
+	if (defined $type) {
 		return htmlize($type, preprocess($page, linkify($page, $parentpage, readfile(srcfile($file))), 1));
 	}
 	else {
@@ -146,8 +140,7 @@ sub genrss ($@) { #{{{
 	
 	my $url="$config{url}/".htmlpage($page);
 	
-	my $template=HTML::Template->new(blind_cache => 1,
-		filename => "$config{templatedir}/rsspage.tmpl");
+	my $template=template("rsspage.tmpl", blind_cache => 1);
 	
 	my @items;
 	foreach my $p (@pages) {
@@ -174,6 +167,7 @@ sub pingurl (@) { #{{{
 	eval q{require RPC::XML::Client};
 	if ($@) {
 		debug("RPC::XML::Client not found, not pinging");
+		return;
 	}
 
 	foreach my $page (keys %toping) {