X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d9ea7d5b0b8f6d224fa909b11c53607f2ae39fa9..80edf46ff216a547676de9e7902072777f715a35:/IkiWiki/Plugin/html.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/html.pm b/IkiWiki/Plugin/html.pm
index 8d3187a71..a7d5e8ce9 100644
--- 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 3.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