From b8225dcbaf6c330d6f177520e853feace950e439 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Nov 2010 02:05:09 -0400 Subject: [PATCH] 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. (cherry picked from commit 289b30a47d548326aad9c1dc5252fc0269494c87) Conflicts: debian/changelog --- IkiWiki/Plugin/htmlscrubber.pm | 4 ++-- debian/changelog | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 847518178..4a90c6f64 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 c599bd915..8ba3ce190 100644 --- 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 Sun, 15 Aug 2010 11:42:55 -0400 -- 2.39.2