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

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 927792f791f2160232671e1327db2a379a496e9d..a58a27d5221acc50e932057b9fabaffcf38c7b97 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} &&
 
        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};
        }
 
                return $params{content};
        }
 

diff --git a/debian/changelog b/debian/changelog
index 59d7eb7614456872e64a3893e88b78f4456b6f19..63e13896ed0e5f5ba80caab4542b85655d6965db 100644 (file)
--- 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)
     (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
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400