Merge branch 'master' into fancypodcast

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

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index fb41e1c838161abd36b34699b847491549ca7aae..9f16dd08296a5743084fc390ddde362e3a6a5fe9 100644 (file)
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -4,11 +4,12 @@ package IkiWiki::Plugin::parentlinks;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
        hook(type => "parentlinks", id => "parentlinks", call => \&parentlinks);
        hook(type => "pagetemplate", id => "parentlinks", call => \&pagetemplate);
+       hook(type => "getsetup", id => "parentlinks", call => \&getsetup);
 }
 
 sub getsetup () {
@@ -16,12 +17,21 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 1,
+                       section => "core",
                },
 }
 
 sub parentlinks ($) {
        my $page=shift;
 
+       if (! length $page) {
+               # dynamic page
+               return {
+                       url => IkiWiki::baseurl(undef),
+                       page => $config{wikiname},
+               };
+       }
+
        my @ret;
        my $path="";
        my $title=$config{wikiname};
@@ -36,7 +46,7 @@ sub parentlinks ($) {
                $depth=$i;
                $height=($pagedepth - $depth);
                push @ret, {
-                       url => urlto($path, $page),
+                       url => urlto(bestlink($page, $path), $page),
                        page => $title,
                        depth => $depth,
                        height => $height,
@@ -52,11 +62,13 @@ sub parentlinks ($) {
 
 sub pagetemplate (@) {
        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($params{page});
+               $template->param(parentlinks => \@links);
+               $template->param(has_parentlinks => (@links > 0));
        }
 }