Merge branch 'master' into fancypodcast

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

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index 432613ddfe92ff1b25d2069db246e49ed72a2222..9f16dd08296a5743084fc390ddde362e3a6a5fe9 100644 (file)
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -9,6 +9,7 @@ use IkiWiki 3.00;
 sub import {
        hook(type => "parentlinks", id => "parentlinks", call => \&parentlinks);
        hook(type => "pagetemplate", id => "parentlinks", call => \&pagetemplate);
+       hook(type => "getsetup", id => "parentlinks", call => \&getsetup);
 }
 
 sub getsetup () {
@@ -26,7 +27,7 @@ sub parentlinks ($) {
        if (! length $page) {
                # dynamic page
                return {
-                       url => $config{url},
+                       url => IkiWiki::baseurl(undef),
                        page => $config{wikiname},
                };
        }
@@ -64,7 +65,7 @@ sub pagetemplate (@) {
         my $template=$params{template};
 
        if ($template->query(name => "parentlinks") ||
-          $template->query(name => "has_parentlinks")) {
+           $template->query(name => "has_parentlinks")) {
                my @links=parentlinks($params{page});
                $template->param(parentlinks => \@links);
                $template->param(has_parentlinks => (@links > 0));