Merge remote-tracking branch 'origin/master'

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

diff --git a/IkiWiki/Plugin/html.pm b/IkiWiki/Plugin/html.pm
index 7623ba6a96accd71d67d8a7ac84c1422ed535224..4dbae081bd9476c154728d32efe4c054e1e954f9 100644 (file)
--- a/IkiWiki/Plugin/html.pm
+++ b/IkiWiki/Plugin/html.pm
@@ -4,20 +4,30 @@ package IkiWiki::Plugin::html;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+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
        $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
+                       section => "format",
+               },
+}
+
+sub htmlize (@) {
        my %params=@_;
        return $params{content};
-} #}}}
+}
 
 1