Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/goodstuff.pm b/IkiWiki/Plugin/goodstuff.pm
index 384123f601b380597bb4dba3c912ecebef6f103f..a18e626d4c94b037d8a05c3c971ab9600f0f6e95 100644 (file)
--- a/IkiWiki/Plugin/goodstuff.pm
+++ b/IkiWiki/Plugin/goodstuff.pm
@@ -4,27 +4,39 @@ package IkiWiki::Plugin::goodstuff;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 my @bundle=qw{
        brokenlinks
        img
        map
-       meta
+       more
        orphans
        pagecount
        pagestats
+       progress
        shortcut
        smiley
        tag
+       table
        template
        toc
        toggle
-       otl
 };
 
 sub import { #{{{
-       IkiWiki::loadplugin($_) foreach @bundle;
+       hook(type => "getsetup", id => "goodstuff", call => \&getsetup);
+       foreach my $plugin (@bundle) {
+               IkiWiki::loadplugin($plugin);
+       }
 } # }}}
 
+sub getsetup { #{{{
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+
 1