work around a bug in... Text::Markdown, I think.

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

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index a94cd469cd78d25395b62ff5a5e48eab1b785514..fa0508900453523b59d41a3e0d04271ae836bf5b 100644 (file)
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -1,17 +1,25 @@
 #!/usr/bin/perl
-# -*- cperl-indent-level: 8; -*-
 # Ikiwiki parentlinks plugin.
 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,
+               },
+}
+
+sub parentlinks ($) {
        my $page=shift;
 
        my @ret;
@@ -23,26 +31,31 @@ sub parentlinks ($) { #{{{
 
        my @pagepath=(split("/", $page));
        my $pagedepth=@pagepath;
+
+       # The last element in @pagepath is the page itself, so punt that
+       # (These are /parent/ links, after all.)
+       pop @pagepath;
+
        foreach my $dir (@pagepath) {
                next if $dir eq 'index';
                $depth=$i;
                $height=($pagedepth - $depth);
-               push @ret, {
-                           url => urlto($path, $page),
-                           page => $title,
-                           depth => $depth,
-                           height => $height,
-                           "depth_$depth" => 1,
-                           "height_$height" => 1,
-                          };
                $path.="/".$dir;
-               $title=IkiWiki::pagetitle($dir);
+               $title=pagetitle($dir);
+               push @ret, {
+                       url => urlto($path, $page),
+                       page => $title,
+                       depth => $depth,
+                       height => $height,
+                       "depth_$depth" => 1,
+                       "height_$height" => 1,
+               };
                $i++;
        }
        return @ret;
-} #}}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
        my %params=@_;
         my $page=$params{page};
         my $template=$params{template};
@@ -50,6 +63,6 @@ sub pagetemplate (@) { #{{{
        if ($template->query(name => "parentlinks")) {
                $template->param(parentlinks => [parentlinks($page)]);
        }
-} # }}}
+}
 
 1