From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 7 Jan 2008 23:32:50 +0000 (-0500)
Subject: * htmlscrubber: Further work around #365971 by adding tags for 'br/', 'hr/'
X-Git-Tag: 2.19~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c1a4402f92204abee5a9425e74864825799f5d2;p=ikiwiki.git

* htmlscrubber: Further work around #365971 by adding tags for 'br/', 'hr/'
  and 'p/'.
---

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 4245c879c..bc613f924 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -24,11 +24,11 @@ sub scrubber { #{{{
 	# With html 5 video and audio tags added.
 	$_scrubber = HTML::Scrubber->new(
 		allow => [qw{
-			a abbr acronym address area b big blockquote br
+			a abbr acronym address area b big blockquote br br/
 			button caption center cite code col colgroup dd del
 			dfn dir div dl dt em fieldset font form h1 h2 h3 h4
-			h5 h6 hr i img input ins kbd label legend li map
-			menu ol optgroup option p pre q s samp select small
+			h5 h6 hr hr/ i img input ins kbd label legend li map
+			menu ol optgroup option p p/ pre q s samp select small
 			span strike strong sub sup table tbody td textarea
 			tfoot th thead tr tt u ul var
 			video audio
diff --git a/debian/changelog b/debian/changelog
index 84219d267..1b83595e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ikiwiki (2.19) UNRELEASED; urgency=low
   * opendiscussion: allow editing of the toplevel discussion page,
     and, indirectly, allow creating new discussion pages.
   * Add a prereq on Data::Dumper 2.11 or better, needed to dump q// objects.
+  * htmlscrubber: Further work around #365971 by adding tags for 'br/', 'hr/'
+    and 'p/'.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 07 Jan 2008 15:35:16 -0500
 
diff --git a/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn b/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn
index f329d5208..e30c4c9c8 100644
--- a/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn
+++ b/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn
@@ -22,3 +22,10 @@ I tried searching the web and wiki but could not find any information on why <br
 > --[[tschwinge]]
 
 > > `<br/>` is also valid, so this is a bug still. --[[madduck]]
+
+>>> It _is_ the htmlscrubber that removes that. It's due to [[debbug 365971]], 
+>>> basically the [[cspan HTML::Scrubber]] doesn't understand xhtml tags
+>>> of this sort at all, I hacked it to support `<br />` by tellig it to treak 
+>>> the "/" as an attribute, but if there's no space, it doesn't see it as 
+>>> an attribute. Hmm, I could also add `br` as a tag name, that would catch both cases.
+>>> Ok, [[done]] --[[Joey]]