trail: no 'up' page if it's a member of the trail

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

diff --git a/IkiWiki/Plugin/trail.pm b/IkiWiki/Plugin/trail.pm
index d5fb2b5d624c1b21cf0fa9163b5b223a090e917e..45b53d4b56498f345405150b0a0f3b52675b451a 100644 (file)
--- a/IkiWiki/Plugin/trail.pm
+++ b/IkiWiki/Plugin/trail.pm
@@ -447,17 +447,26 @@ sub pagetemplate (@) {
                                $nexttitle = title_of($next);
                        }
 
-                       push @trails, {
+                       my %trail_info = (
                                prevpage => $prev,
                                prevtitle => $prevtitle,
                                prevurl => $prevurl,
                                nextpage => $next,
                                nexttitle => $nexttitle,
                                nexturl => $nexturl,
-                               trailpage => $trail,
-                               trailtitle => title_of($trail),
-                               trailurl => urlto($trail, $page),
+                       );
+
+                       # the trail index is added as 'up' page, but only if it's
+                       # not a page in the trail itself. This allows the definition of
+                       # up-less trails by using e.g. the trailitems directive in one of the
+                       # pages of the trail
+                       unless ($trail ~~ @$members) {
+                               $trail_info{trailpage} = $trail;
+                               $trail_info{trailtitle} = title_of($trail);
+                               $trail_info{trailurl} = urlto($trail, $page);
                        };
+
+                       push @trails, \%trail_info;
                }
 
                $template->param(trailloop => \@trails);