Merge remote branch 'smcv/ready/localurl'

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

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index 432613ddfe92ff1b25d2069db246e49ed72a2222..203ea13b649e288fe4935d2743469721c15eb1e1 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);
 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 () {
 }
 
 sub getsetup () {


@@ -26,7 +27,7 @@ sub parentlinks ($) {
        if (! length $page) {
                # dynamic page
                return {
        if (! length $page) {
                # dynamic page
                return {

-                       url => $config{url},
+                       url => IkiWiki::baseurl(undef),

                        page => $config{wikiname},
                };
        }
                        page => $config{wikiname},
                };
        }