From: Joey Hess <joey@kitenet.net>
Date: Fri, 12 Nov 2010 03:59:24 +0000 (-0400)
Subject: Fix htmlscrubber_skip to be matched on the source page, not the page it is inlined... 
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/289b30a47d548326aad9c1dc5252fc0269494c87

Fix htmlscrubber_skip to be matched on the source page, not the page it is inlined into. Should allow setting to "* and !comment(*)" to scrub comments, but leave your blog posts unscrubbed, etc.
---

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 927792f79..a58a27d52 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -57,8 +57,8 @@ sub sanitize (@) {
 
 	if (exists $config{htmlscrubber_skip} &&
 	    length $config{htmlscrubber_skip} &&
-	    exists $params{destpage} &&
-	    pagespec_match($params{destpage}, $config{htmlscrubber_skip})) {
+	    exists $params{page} &&
+	    pagespec_match($params{page}, $config{htmlscrubber_skip})) {
 		return $params{content};
 	}
 
diff --git a/debian/changelog b/debian/changelog
index 59d7eb761..63e13896e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low
     (Thanks, Craig Lennox and Tuomas Jormola)
   * git: Use author date, not committer date. Closes: #602012
     (Thanks, Tuomas Jormola)
+  * Fix htmlscrubber_skip to be matched on the source page, not the page it is
+    inlined into. Should allow setting to "* and !comment(*)" to scrub
+    comments, but leave your blog posts unscrubbed, etc.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400