Merge branch 'master' into pedigree

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

diff --git a/IkiWiki/Plugin/pedigree.pm b/IkiWiki/Plugin/pedigree.pm
index 3d1e3764d9f8fd110e0a9d06044e8c90c8864409..f91ea94b484a1ce3bde2966b10878aa593c319f2 100644 (file)
--- a/IkiWiki/Plugin/pedigree.pm
+++ b/IkiWiki/Plugin/pedigree.pm
@@ -27,6 +27,7 @@ sub pedigree ($) { #{{{
                            url => urlto($path, $page),
                            page => $title,
                            absdepth => $i,
                            url => urlto($path, $page),
                            page => $title,
                            absdepth => $i,

+                           distance => ($pagedepth - $i),

                            is_root => ($i eq 0),
                            is_second_ancestor => ($i eq 1),
                            is_grand_mother => ($i eq ($pagedepth - 2)),
                            is_root => ($i eq 0),
                            is_second_ancestor => ($i eq 1),
                            is_grand_mother => ($i eq ($pagedepth - 2)),


@@ -54,8 +55,11 @@ sub forget_oldest ($@) { #{{{
                        # references to hashes)...
                        $parent=shift @pedigree;
                        # ... but we have no copy of the referenced hashes, so we
                        # references to hashes)...
                        $parent=shift @pedigree;
                        # ... but we have no copy of the referenced hashes, so we

-                       # actually are modifying them in-place, but we don't care
-                       # here since reldepth has to be computed everytime anyway.
+                       # actually are modifying them in-place, which
+                       # means the second (and following) calls to
+                       # this function overwrite the previous one's
+                       # reldepth values => known bug if PEDIGREE_BUT_ROOT and
+                       # PEDIGREE_BUT_TWO_OLDEST are used in the same template

                        $parent->{reldepth}=($parent->{absdepth} - $offset);
                        push @ret, $parent;
                }
                        $parent->{reldepth}=($parent->{absdepth} - $offset);
                        push @ret, $parent;
                }


@@ -68,16 +72,18 @@ sub pagetemplate (@) { #{{{
         my $page=$params{page};
         my $template=$params{template};
 
         my $page=$params{page};
         my $template=$params{template};
 

-       if ($template->query(name => "pedigree")
-           or $template->query(name => "pedigree_but_root")
-           or $template->query(name => "pedigree_but_two_oldest")
-          )
-         {
-                 my @pedigree=pedigree($page);
-                 $template->param(pedigree => \@pedigree);
-                 $template->param(pedigree_but_root => [forget_oldest(1, @pedigree)]);
-                 $template->param(pedigree_but_two_oldest => [forget_oldest(2, @pedigree)]);
-         }
+       my @pedigree=pedigree($page)
+         if ($template->query(name => "pedigree")
+             or $template->query(name => "pedigree_but_root")
+             or $template->query(name => "pedigree_but_two_oldest")
+            );
+
+       $template->param(pedigree => \@pedigree)
+         if ($template->query(name => "pedigree"));
+       $template->param(pedigree_but_root => [forget_oldest(1, @pedigree)])
+         if ($template->query(name => "pedigree_but_root"));
+       $template->param(pedigree_but_two_oldest => [forget_oldest(2, @pedigree)])
+         if ($template->query(name => "pedigree_but_two_oldest"));

 
 } # }}}
 
 
 } # }}}