From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 18 Nov 2007 18:34:06 +0000 (-0500)
Subject: * Allow html5 video and audio tags and their attributes in the htmlscrubber.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/e016a975c48175f7dbe2c5cb3f9f8b0b019ac33a

* Allow html5 video and audio tags and their attributes in the htmlscrubber.
---

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 540662c2b..4245c879c 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -21,6 +21,7 @@ sub scrubber { #{{{
 	eval q{use HTML::Scrubber};
 	error($@) if $@;
 	# Lists based on http://feedparser.org/docs/html-sanitization.html
+	# With html 5 video and audio tags added.
 	$_scrubber = HTML::Scrubber->new(
 		allow => [qw{
 			a abbr acronym address area b big blockquote br
@@ -30,6 +31,7 @@ sub scrubber { #{{{
 			menu ol optgroup option 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
 		}],
 		default => [undef, { (
 			map { $_ => 1 } qw{
@@ -45,6 +47,8 @@ sub scrubber { #{{{
 				selected shape size span src start summary
 				tabindex target title type usemap valign
 				value vspace width
+				poster autoplay loopstart loopend end
+				playcount controls 
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			}],
diff --git a/debian/changelog b/debian/changelog
index ccfa808fe..4ee2f7c80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ ikiwiki (2.13) UNRELEASED; urgency=low
   * When usedirs is disabled, link direct to index.html files, not to
     directories, to improve browsing of file:// urls.
     Patch by Daniel Burrows. Closes: #451728
+  * Allow html5 video and audio tags and their attributes in the htmlscrubber.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 17 Nov 2007 19:56:46 -0500