Revert "added the targetpage hook"

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

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

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

-       IkiWiki::hook(type => "htmlize", id => "html", call => \&htmlize);
-       IkiWiki::hook(type => "htmlize", id => "htm", call => \&htmlize);
+       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 getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1, # format plugin
+               },
+} #}}}
+

 sub htmlize (@) { #{{{
        my %params=@_;
        return $params{content};
 sub htmlize (@) { #{{{
        my %params=@_;
        return $params{content};