comments: substitute commentsurl and atomcommentsurl for use in feeds

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

diff --git a/IkiWiki/Plugin/html.pm b/IkiWiki/Plugin/html.pm
index 8d3187a71f50ffbf33152fed8999b3802d7df4f5..9b9547cca77aec3235b7ca4e642a8c47b2067365 100644 (file)
--- a/IkiWiki/Plugin/html.pm
+++ b/IkiWiki/Plugin/html.pm
@@ -4,15 +4,29 @@ package IkiWiki::Plugin::html;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
-sub import { #{{{
-       IkiWiki::hook(type => "htmlize", id => "html", call => sub { shift });
-       IkiWiki::hook(type => "htmlize", id => "htm", call => sub { shift });
+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::config{wiki_file_prune_regexp} =~ s/\|\\\.x\?html\?\$//;
-} # }}}
+       $config{wiki_file_prune_regexps} = [ grep { !m/\\\.x\?html\?\$/ } @{$config{wiki_file_prune_regexps}} ];
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1, # format plugin
+               },
+}
+
+sub htmlize (@) {
+       my %params=@_;
+       return $params{content};
+}
 
 1