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 effbc7de9ff14759409ba36bf9b18d8230fe2123..ed1f4ddfc6cab5d88604be3fbe409ba3a573f642 100644 (file)
--- a/IkiWiki/Plugin/goodstuff.pm
+++ b/IkiWiki/Plugin/goodstuff.pm
@@ -11,20 +11,33 @@ my @bundle=qw{
        img
        map
        meta
        img
        map
        meta

+       more

        orphans
        pagecount
        pagestats
        orphans
        pagecount
        pagestats

+       progress

        shortcut
        smiley
        tag
        shortcut
        smiley
        tag

+       table

        template
        toc
        toggle
        template
        toc
        toggle

-       otl

 };
 
 sub import { #{{{
 };
 
 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
 1