Merge branch 'master' into next

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

diff --git a/IkiWiki/Plugin/goodstuff.pm b/IkiWiki/Plugin/goodstuff.pm
index 08ed960b4a3ff8bc7d10419e765a7bd3b4fbc8f0..46f2380cfa4ca98f071a45219c6fa9514d8f664c 100644 (file)
--- a/IkiWiki/Plugin/goodstuff.pm
+++ b/IkiWiki/Plugin/goodstuff.pm
@@ -4,13 +4,12 @@ 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
@@ -25,17 +24,19 @@ my @bundle=qw{
        toggle
 };
 
-sub import { #{{{
+sub import {
        hook(type => "getsetup", id => "goodstuff", call => \&getsetup);
-       IkiWiki::loadplugin($_) foreach @bundle;
-} # }}}
+       foreach my $plugin (@bundle) {
+               IkiWiki::loadplugin($plugin);
+       }
+}
 
-sub getsetup { #{{{
+sub getsetup {
        return 
                plugin => {
                        safe => 1,
                        rebuild => undef,
                },
-} #}}}
+}
 
 1