Fix htmlscrubber_skip to be matched on the source page, not the page it is inlined...

(cherry picked from commit 289b30a47d548326aad9c1dc5252fc0269494c87)

Conflicts:

	debian/changelog

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 8475181780db55cfd1b0e0846f277e44fa87e156..4a90c6f648ff895c9b200e1960fd22c9957e9bdc 100644 (file)
--- 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 c599bd915a44a86402caf0175fe0e7dc40aa6ce3..8ba3ce190975c0a511b6e9a5542dd651896fedd4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ ikiwiki (3.20100815.2) UNRELEASED; urgency=low
   * websetup: Fix defaults of checkboxes in advanced mode.
   * Fix test suite failure on other side of date line.
   * Set isPermaLink="no" for guids in rss feeds. 
+  * 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>  Sun, 15 Aug 2010 11:42:55 -0400