X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=IkiWiki%2FPlugin%2Fparentlinks.pm;h=728bbc399fe8b50e247318158a57bd5c2facad96;hp=890a349b597ed2b7193ece1738436c595bd6c05b;hb=54f600af14bf6dc067ffc30ec6f22d517001fe99;hpb=3096c8ea69783b1c1cfbf5b9f940d2939d2a33f5

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index 890a349b5..728bbc399 100644
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -4,13 +4,23 @@ package IkiWiki::Plugin::parentlinks;
 
 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);
-} # }}}
+}
 
-sub parentlinks ($) { #{{{
+sub getsetup () {
+	return 
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+			section => "core",
+		},
+}
+
+sub parentlinks ($) {
 	my $page=shift;
 
 	my @ret;
@@ -27,7 +37,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,
@@ -35,20 +45,23 @@ sub parentlinks ($) { #{{{
 			"height_$height" => 1,
 		};
 		$path.="/".$dir;
-		$title=IkiWiki::pagetitle($dir);
+		$title=pagetitle($dir);
 		$i++;
 	}
 	return @ret;
-} #}}}
+}
 
-sub pagetemplate (@) { #{{{
+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($page);
+		$template->param(parentlinks => \@links);
+		$template->param(has_parentlinks => (@links > 0));
 	}
-} # }}}
+}
 
 1