correct variable scoping error in nils's patch

[ikiwiki.git] / IkiWiki / Plugin / htmlscrubber.pm

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 540662c2b4d1fcc0cf1c8a0a89d08c3c0eabe280..4245c879cdefa12f127306a0136fdfdc1d00164f 100644 (file)
--- 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
        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
        $_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
                        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{
                }],
                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
                                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
                        }],
                        } ),
                        "/" => 1, # emit proper <hr /> XHTML
                        }],