Merge branch 'master' into cvs

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

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