Merge branch 'master' into dependency-types

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

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index a8b3641e922a43e51a5d295ce64c6ad042890726..e678a057d2bdf9a03aa741f8bd019f39e8667bca 100644 (file)
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -4,22 +4,22 @@ package IkiWiki::Plugin::parentlinks;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {

        hook(type => "parentlinks", id => "parentlinks", call => \&parentlinks);
        hook(type => "pagetemplate", id => "parentlinks", call => \&pagetemplate);
        hook(type => "parentlinks", id => "parentlinks", call => \&parentlinks);
        hook(type => "pagetemplate", id => "parentlinks", call => \&pagetemplate);

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return 
                plugin => {
                        safe => 1,
                        rebuild => 1,
                },
        return 
                plugin => {
                        safe => 1,
                        rebuild => 1,
                },

-} #}}}
+}

 
 

-sub parentlinks ($) { #{{{
+sub parentlinks ($) {

        my $page=shift;
 
        my @ret;
        my $page=shift;
 
        my @ret;


@@ -36,7 +36,7 @@ sub parentlinks ($) { #{{{
                $depth=$i;
                $height=($pagedepth - $depth);
                push @ret, {
                $depth=$i;
                $height=($pagedepth - $depth);
                push @ret, {

-                       url => urlto($path, $page),
+                       url => urlto(bestlink($page, $path), $page),

                        page => $title,
                        depth => $depth,
                        height => $height,
                        page => $title,
                        depth => $depth,
                        height => $height,


@@ -48,16 +48,19 @@ sub parentlinks ($) { #{{{
                $i++;
        }
        return @ret;
                $i++;
        }
        return @ret;

-} #}}}
+}

 
 

-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {

        my %params=@_;
         my $page=$params{page};
         my $template=$params{template};
 
        my %params=@_;
         my $page=$params{page};
         my $template=$params{template};
 

-       if ($template->query(name => "parentlinks")) {
-               $template->param(parentlinks => [parentlinks($page)]);
+       if ($template->query(name => "parentlinks") ||
+          $template->query(name => "has_parentlinks")) {
+               my @links=parentlinks($page);
+               $template->param(parentlinks => \@links);
+               $template->param(has_parentlinks => (@links > 0));

        }
        }

-} # }}}
+}

 
 1
 
 1