diff options
| -rw-r--r-- | IkiWiki.pm | 6 | ||||
| -rw-r--r-- | IkiWiki/Plugin/parentlinks.pm | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index a79b66039..ee1ecb58f 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1748,16 +1748,12 @@ sub misctemplate ($$;@) { $template->param( dynamic => 1, + have_actions => 0, # force off title => $title, wikiname => $config{wikiname}, content => $content, baseurl => baseurl(), html5 => $config{html5}, - have_actions => 0, # force off - parentlinks => [{ # override - url => $config{url}, - page => $config{wikiname}, - }], @_, ); diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm index 728bbc399..432613ddf 100644 --- a/IkiWiki/Plugin/parentlinks.pm +++ b/IkiWiki/Plugin/parentlinks.pm @@ -23,6 +23,14 @@ sub getsetup () { sub parentlinks ($) { my $page=shift; + if (! length $page) { + # dynamic page + return { + url => $config{url}, + page => $config{wikiname}, + }; + } + my @ret; my $path=""; my $title=$config{wikiname}; @@ -53,12 +61,11 @@ sub parentlinks ($) { sub pagetemplate (@) { my %params=@_; - my $page=$params{page}; my $template=$params{template}; if ($template->query(name => "parentlinks") || $template->query(name => "has_parentlinks")) { - my @links=parentlinks($page); + my @links=parentlinks($params{page}); $template->param(parentlinks => \@links); $template->param(has_parentlinks => (@links > 0)); } |