X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a584b547e2d0dc40d90579a803221c1b9dd61fad..f910c81b89fe8cf99cb5eabfaec4bd47eb78c61a:/IkiWiki.pm diff --git a/IkiWiki.pm b/IkiWiki.pm index 0b576b32f..a4657a311 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -548,10 +548,11 @@ sub beautify_url ($) { #{{{ return $url; } #}}} -sub urlto ($$) { #{{{ +sub urlto ($$;$) { #{{{ my $to=shift; my $from=shift; - + my $absolute=shift; + if (! length $to) { return beautify_url(baseurl($from)."index.$config{htmlext}"); } @@ -560,6 +561,10 @@ sub urlto ($$) { #{{{ $to=htmlpage($to); } + if ($absolute) { + return $config{url}.beautify_urlpath("/".$to); + } + my $link = abs2rel($to, dirname(htmlpage($from))); return beautify_url($link);