Pass a destpage parameter to the sanitize hook.

Because the search plugin needed it, also because it's one of the few
plugins that didn't already have it.

I also considered adding it to htmlize, but I really cannot imagine caring
what the destpage is when htmlizing. (I'll probably be poven wrong later.)

6 files changed, 7 insertions, 7 deletions

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 7d81e9182..344620ebe 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -352,7 +352,7 @@ sub get_inline_content ($$) { #{{{
 	my $type=pagetype($file);
 	if (defined $type) {
 		$nested++;
-		my $ret=htmlize($page, $type,
+		my $ret=htmlize($page, $destpage, $type,
 		       linkify($page, $destpage,
 		       preprocess($page, $destpage,
 		       filter($page, $destpage,
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 0afe1c362..e2914a78a 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -53,7 +53,7 @@ sub htmlize ($$$) { #{{{
 	my $page = shift;
 	my $destpage = shift;
 
-	return IkiWiki::htmlize($page, pagetype($pagesources{$page}),
+	return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}),
 		IkiWiki::linkify($page, $destpage,
 		IkiWiki::preprocess($page, $destpage, shift)));
 }
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 3dc70f0b7..aa0a8085e 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -57,7 +57,7 @@ my $scrubber;
 sub index (@) { #{{{
 	my %params=@_;
 	
-	return $params{content} if %IkiWiki::preprocessing;
+	return $params{content} if $IkiWiki::preprocessing{$params{destpage}};
 	
 	my $db=xapiandb();
 	my $doc=Search::Xapian::Document->new();
@@ -70,7 +70,7 @@ sub index (@) { #{{{
 		$title=IkiWiki::pagetitle($params{page});
 	}
 
-	# Remove any html from text to be indexed.
+	# Remove html from text to be indexed.
 	if (! defined $scrubber) {
 		eval q{use HTML::Scrubber};
 		if (! $@) {
diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index a49726768..7c2e6e1f6 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -27,7 +27,7 @@ sub sidebar_content ($) { #{{{
 
 		my $content=readfile(srcfile($sidebar_file));
 		return unless length $content;
-		return IkiWiki::htmlize($page, $sidebar_type,
+		return IkiWiki::htmlize($sidebar_page, $page, $sidebar_type,
 		       IkiWiki::linkify($sidebar_page, $page,
 		       IkiWiki::preprocess($sidebar_page, $page,
 		       IkiWiki::filter($sidebar_page, $page, $content))));
diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 20c71e1c7..11474c8f0 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -175,7 +175,7 @@ sub htmlize ($$$) { #{{{
 	my $page = shift;
 	my $destpage = shift;
 
-	return IkiWiki::htmlize($page, pagetype($pagesources{$page}),
+	return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}),
 		IkiWiki::preprocess($page, $destpage, shift));
 }
 
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 416762fe1..a6e34fcc9 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -48,7 +48,7 @@ sub preprocess (@) { #{{{
 	foreach my $param (keys %params) {
 		if ($template->query(name => $param)) {
 			$template->param($param =>
-				IkiWiki::htmlize($params{page},
+				IkiWiki::htmlize($params{page}, $params{destpage},
 					pagetype($pagesources{$params{page}}),
 					$params{$param}));
 		}