Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index d2cebca342756fdbb8d9a31e34b43fe527bd4b4d..835e253886d67e2223bab034643c4823fa8d23bb 100644 (file)
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -19,6 +19,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
                directive_description_dir => {
                        type => "string",
                },
                directive_description_dir => {
                        type => "string",


@@ -45,7 +46,7 @@ sub checkconfig () {
 sub needsbuild (@) {
        my $needsbuild=shift;
 
 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);
 
        @shortlist = grep { ! $IkiWiki::hooks{preprocess}{$_}{shortcut} } @fulllist;
        $pluginstring = join(' ', @shortlist) . " : " . join(' ', @fulllist);
 


@@ -63,6 +64,8 @@ sub needsbuild (@) {
                        }
                }
        }
                        }
                }
        }

+
+       return $needsbuild;

 }
 
 sub preprocess (@) {
 }
 
 sub preprocess (@) {


@@ -84,7 +87,7 @@ sub preprocess (@) {
        foreach my $plugin (@pluginlist) {
                $result .= '<li class="listdirectives">';
                my $link=linkpage($config{directive_description_dir}."/".$plugin);
        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>';
        }
                $result .= htmllink($params{page}, $params{destpage}, $link);
                $result .= '</li>';
        }