cherry-pick uri security fix

[git.ikiwiki.info.git] / IkiWiki / Plugin / html.pm

diff --git a/IkiWiki/Plugin/html.pm b/IkiWiki/Plugin/html.pm
index 4270a7eb67c247123cacf2a4fd486157ccbdb780..7623ba6a96accd71d67d8a7ac84c1422ed535224 100644 (file)
--- a/IkiWiki/Plugin/html.pm
+++ b/IkiWiki/Plugin/html.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::html;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
        hook(type => "htmlize", id => "html", call => \&htmlize);
 
 sub import { #{{{
        hook(type => "htmlize", id => "html", call => \&htmlize);


@@ -12,7 +12,7 @@ sub import { #{{{
 
        # ikiwiki defaults to skipping .html files as a security measure;
        # make it process them so this plugin can take effect
 
        # ikiwiki defaults to skipping .html files as a security measure;
        # make it process them so this plugin can take effect

-       $config{wiki_file_prune_regexp} =~ s/\|\\\.x\?html\?\$//;
+       $config{wiki_file_prune_regexps} = [ grep { !m/\\\.x\?html\?\$/ } @{$config{wiki_file_prune_regexps}} ];

 } # }}}
 
 sub htmlize (@) { #{{{
 } # }}}
 
 sub htmlize (@) { #{{{