add news item for ikiwiki 3.20091218

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

diff --git a/IkiWiki/Plugin/html.pm b/IkiWiki/Plugin/html.pm
index 83720b4b59c84e5b317f46e77e4ca9e82b29a02e..a7d5e8ce91af28d9053b9b831564e9b1fc13a7b3 100644 (file)
--- a/IkiWiki/Plugin/html.pm
+++ b/IkiWiki/Plugin/html.pm
@@ -4,20 +4,29 @@ package IkiWiki::Plugin::html;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
-       IkiWiki::hook(type => "htmlize", id => "html", call => \&htmlize);
-       IkiWiki::hook(type => "htmlize", id => "htm", call => \&htmlize);
+sub import {
+       hook(type => "getsetup", id => "html", call => \&getsetup);
+       hook(type => "htmlize", id => "html", call => \&htmlize);
+       hook(type => "htmlize", id => "htm", call => \&htmlize);

 
        # 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

-       $IkiWiki::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 getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1, # format plugin
+               },
+}
+
+sub htmlize (@) {

        my %params=@_;
        return $params{content};
        my %params=@_;
        return $params{content};

-} #}}}
+}

 
 1
 
 1