Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index 6f8ddb06af86faa60a0b028db8f0f1bf7626ae15..2ab3e4665fc2c95000f6c22bd14bbc246775ed66 100644 (file)
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -30,7 +30,7 @@ sub getsetup () { #{{{
 } #}}}
 
 my @fulllist;
 } #}}}
 
 my @fulllist;

-my @earlylist;
+my @shortlist;

 my $pluginstring;
 
 sub checkconfig () { #{{{
 my $pluginstring;
 
 sub checkconfig () { #{{{


@@ -40,15 +40,14 @@ sub checkconfig () { #{{{
        else {
                $config{directive_description_dir} =~ s/\/+$//;
        }
        else {
                $config{directive_description_dir} =~ s/\/+$//;
        }

-
-       @earlylist = sort keys %{$IkiWiki::hooks{preprocess}};

 } #}}}
 
 sub needsbuild (@) { #{{{
        my $needsbuild=shift;
 
        @fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
 } #}}}
 
 sub needsbuild (@) { #{{{
        my $needsbuild=shift;
 
        @fulllist = sort keys %{$IkiWiki::hooks{preprocess}};

-       $pluginstring = join(' ', @earlylist) . " : " . join(' ', @fulllist);
+       @shortlist = grep { ! $IkiWiki::hooks{preprocess}{$_}{shortcut} } @fulllist;
+       $pluginstring = join(' ', @shortlist) . " : " . join(' ', @fulllist);

 
        foreach my $page (keys %pagestate) {
                if (exists $pagestate{$page}{listdirectives}{shown}) {
 
        foreach my $page (keys %pagestate) {
                if (exists $pagestate{$page}{listdirectives}{shown}) {


@@ -77,14 +76,14 @@ sub preprocess (@) { #{{{
                @pluginlist = @fulllist;
        }
        else {
                @pluginlist = @fulllist;
        }
        else {

-               @pluginlist = @earlylist;
+               @pluginlist = @shortlist;

        }
        
        my $result = '<ul class="listdirectives">';
        
        foreach my $plugin (@pluginlist) {
                $result .= '<li class="listdirectives">';
        }
        
        my $result = '<ul class="listdirectives">';
        
        foreach my $plugin (@pluginlist) {
                $result .= '<li class="listdirectives">';

-               my $link=IkiWiki::linkpage($config{directive_description_dir}."/".$plugin);
+               my $link=linkpage($config{directive_description_dir}."/".$plugin);

                add_depends($params{page}, $link);
                $result .= htmllink($params{page}, $params{destpage}, $link);
                $result .= '</li>';
                add_depends($params{page}, $link);
                $result .= htmllink($params{page}, $params{destpage}, $link);
                $result .= '</li>';