diff options
| author | Joey Hess <joey@kitenet.net> | 2010-11-11 23:59:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-12 00:00:54 -0400 |
| commit | 289b30a47d548326aad9c1dc5252fc0269494c87 (patch) | |
| tree | 71f1afd6746a837730d717b493ccb02ac0653dfe | |
| parent | 0a7db85f06674311b80b490dfc238a1eaed040f8 (diff) | |
| download | ikiwiki-289b30a47d548326aad9c1dc5252fc0269494c87.tar ikiwiki-289b30a47d548326aad9c1dc5252fc0269494c87.tar.gz | |
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.
| -rw-r--r-- | IkiWiki/Plugin/htmlscrubber.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 5 insertions, 2 deletions
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 |