Merge branch 'master' into dependency-types

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

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index be82b0495f4d3481a80cf9ca33e981adf6f49ae8..09f08c5671ad82a7562a558342723669e5614641 100644 (file)
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::listdirectives;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
        add_underlay("directives");
@@ -45,7 +45,7 @@ sub checkconfig () {
 sub needsbuild (@) {
        my $needsbuild=shift;
 
-       @fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
+       @fulllist = grep { ! /^_/ } sort keys %{$IkiWiki::hooks{preprocess}};
        @shortlist = grep { ! $IkiWiki::hooks{preprocess}{$_}{shortcut} } @fulllist;
        $pluginstring = join(' ', @shortlist) . " : " . join(' ', @fulllist);
 
@@ -84,7 +84,7 @@ sub preprocess (@) {
        foreach my $plugin (@pluginlist) {
                $result .= '<li class="listdirectives">';
                my $link=linkpage($config{directive_description_dir}."/".$plugin);
-               add_depends($params{page}, $link);
+               add_depends($params{page}, $link, deptype("presence"));
                $result .= htmllink($params{page}, $params{destpage}, $link);
                $result .= '</li>';
        }