From e7d71dea47d82b02731ed510e3c5bb305a60b742 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 1 Dec 2010 20:53:39 -0400
Subject: [PATCH] cherry-pick reversion fix

---
 IkiWiki/Plugin/meta.pm | 14 +++++++-------
 debian/changelog       |  8 ++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index d18585d3d..eccbf976c 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -39,10 +39,10 @@ sub needsbuild (@) {
 	}
 }
 
-sub scrub ($$) {
+sub scrub ($$$) {
 	if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
 		return IkiWiki::Plugin::htmlscrubber::sanitize(
-			content => shift, destpage => shift);
+			content => shift, page => shift, destpage => shift);
 	}
 	else {
 		return shift;
@@ -161,7 +161,7 @@ sub preprocess (@) {
 	# Metadata handling that happens only during preprocessing pass.
 	if ($key eq 'permalink') {
 		if (safeurl($value)) {
-			push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $destpage);
+			push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $page, $destpage);
 		}
 	}
 	elsif ($key eq 'stylesheet') {
@@ -235,7 +235,7 @@ sub preprocess (@) {
 		my $delay=int(exists $params{delay} ? $params{delay} : 0);
 		my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />";
 		if (! $safe) {
-			$redir=scrub($redir, $destpage);
+			$redir=scrub($redir, $page, $destpage);
 		}
 		push @{$metaheaders{$page}}, $redir;
 	}
@@ -245,7 +245,7 @@ sub preprocess (@) {
 				join(" ", map {
 					encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
 				} keys %params).
-				" />\n", $destpage);
+				" />\n", $page, $destpage);
 		}
 	}
 	elsif ($key eq 'robots') {
@@ -261,12 +261,12 @@ sub preprocess (@) {
 		push @{$metaheaders{$page}}, scrub('<meta '.$key.'="'.
 			encode_entities($value).
 			join(' ', map { "$_=\"$params{$_}\"" } keys %params).
-			' />', $destpage);
+			' />', $page, $destpage);
 	}
 	else {
 		push @{$metaheaders{$page}}, scrub('<meta name="'.
 			encode_entities($key).'" content="'.
-			encode_entities($value).'" />', $destpage);
+			encode_entities($value).'" />', $page, $destpage);
 	}
 
 	return "";
diff --git a/debian/changelog b/debian/changelog
index 78102242b..2502e1a54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (3.20100815.3) testing; urgency=low
+
+  * meta: Fix calling of htmlscrubber to pass the page parameter.
+    The change of the htmlscrubber to look at page rather than destpage
+    caused htmlscrubber_skip to not work for meta directives.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 29 Nov 2010 14:44:13 -0400
+
 ikiwiki (3.20100815.2) testing; urgency=low
 
   * Bugfix-only cherry-pick release for Debian squeeze.
-- 
2.39.2