X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/20eacc2c1f74d0ab617dca36378a35920e313a23..e49ff966a39d1037ccbf168b8dbd12618cf1b41e:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 749e39fb6..7bb71a436 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -21,6 +21,7 @@ sub import { #{{{
 package IkiWiki;
 
 my %toping;
+my $processing_inline=0;
 
 sub preprocess_inline (@) { #{{{
 	my %params=@_;
@@ -35,6 +36,12 @@ sub preprocess_inline (@) { #{{{
 		$params{show}=10;
 	}
 
+	# Avoid nested inlines, to avoid loops etc.
+	if ($processing_inline) {
+		return "";
+	}
+	$processing_inline=1;
+
 	my @list;
 	foreach my $page (keys %pagesources) {
 		next if $page eq $params{page};
@@ -51,7 +58,7 @@ sub preprocess_inline (@) { #{{{
 
 	my $ret="";
 	
-	if (exists $params{rootpage}) {
+	if (exists $params{rootpage} && $config{cgiurl}) {
 		# Add a blog post form, with a rss link button.
 		my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
 		$formtemplate->param(cgiurl => $config{cgiurl});
@@ -77,15 +84,14 @@ sub preprocess_inline (@) { #{{{
 	
 	foreach my $page (@list) {
 		$template->param(pagelink => htmllink($params{page}, $params{page}, $page));
-		$template->param(content => get_inline_content($params{page}, $page))
+		$template->param(content => get_inline_content($page, $params{page}))
 			if $params{archive} eq "no";
 		$template->param(ctime => displaytime($pagectime{$page}));
 
-		if (exists $hooks{pagetemplate}) {
-			foreach my $id (keys %{$hooks{pagetemplate}}) {
-				$hooks{pagetemplate}{$id}{call}->($page, $template);
-			}
-		}
+		run_hooks(pagetemplate => sub {
+			shift->(page => $page, destpage => $params{page},
+				template => $template,);
+		});
 
 		$ret.=$template->output;
 		$template->clear_params;
@@ -100,17 +106,19 @@ sub preprocess_inline (@) { #{{{
 		$toping{$params{page}}=1 unless $config{rebuild};
 	}
 	
+	$processing_inline=0;
+
 	return $ret;
 } #}}}
 
 sub get_inline_content ($$) { #{{{
-	my $parentpage=shift;
 	my $page=shift;
+	my $destpage=shift;
 	
 	my $file=$pagesources{$page};
 	my $type=pagetype($file);
 	if (defined $type) {
-		return htmlize($type, preprocess($page, linkify($page, $parentpage, readfile(srcfile($file))), 1));
+		return htmlize($type, preprocess($page, $destpage, linkify($page, $destpage, readfile(srcfile($file)))));
 	}
 	else {
 		return "";
@@ -148,7 +156,8 @@ sub genrss ($@) { #{{{
 	
 	my $url="$config{url}/".htmlpage($page);
 	
-	my $template=template("rsspage.tmpl", blind_cache => 1);
+	my $template=template("rsspage.tmpl", blind_cache => 1,
+		die_on_bad_params => 0);
 	
 	my @items;
 	foreach my $p (@pages) {
@@ -156,7 +165,8 @@ sub genrss ($@) { #{{{
 			itemtitle => pagetitle(basename($p)),
 			itemurl => "$config{url}/$renderedfiles{$p}",
 			itempubdate => date_822($pagectime{$p}),
-			itemcontent => absolute_urls(get_inline_content($page, $p), $url),
+			itemcontent => absolute_urls(get_inline_content($p, $page), $url),
+			page => $p, # used by category adding code in tag plugin
 		} if exists $renderedfiles{$p};
 	}
 
@@ -166,6 +176,11 @@ sub genrss ($@) { #{{{
 		items => \@items,
 	);
 	
+	run_hooks(pagetemplate => sub {
+		shift->(page => $page, destpage => $page,
+			template => $template);
+	});
+	
 	return $template->output;
 } #}}}