Merge branch 'master' into pub/master

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

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index a94cd469cd78d25395b62ff5a5e48eab1b785514..a8b3641e922a43e51a5d295ce64c6ad042890726 100644 (file)
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-# -*- cperl-indent-level: 8; -*-

 # Ikiwiki parentlinks plugin.
 package IkiWiki::Plugin::parentlinks;
 
 # Ikiwiki parentlinks plugin.
 package IkiWiki::Plugin::parentlinks;
 


@@ -8,9 +7,18 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
 use IkiWiki 2.00;
 
 sub import { #{{{

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

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

+sub getsetup () { #{{{
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+} #}}}
+

 sub parentlinks ($) { #{{{
        my $page=shift;
 
 sub parentlinks ($) { #{{{
        my $page=shift;
 


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

-                           url => urlto($path, $page),
-                           page => $title,
-                           depth => $depth,
-                           height => $height,
-                           "depth_$depth" => 1,
-                           "height_$height" => 1,
-                          };
+                       url => urlto($path, $page),
+                       page => $title,
+                       depth => $depth,
+                       height => $height,
+                       "depth_$depth" => 1,
+                       "height_$height" => 1,
+               };

                $path.="/".$dir;
                $path.="/".$dir;

-               $title=IkiWiki::pagetitle($dir);
+               $title=pagetitle($dir);

                $i++;
        }
        return @ret;
                $i++;
        }
        return @ret;