baseurl(): return local path, not absolute URL, if the argument is undef

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 989f3bee7ca47b427f8ba68806db3c80a0117589..a4afef8e0381f337d9cf8c26fe961210a2f5aaf0 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1039,7 +1039,8 @@ sub linkpage ($) {
 sub cgiurl (@) {
        my %params=@_;
 
-       my $cgiurl=$config{cgiurl};
+       my $cgiurl=$local_cgiurl;
+
        if (exists $params{cgiurl}) {
                $cgiurl=$params{cgiurl};
                delete $params{cgiurl};
@@ -1056,7 +1057,7 @@ sub cgiurl (@) {
 sub baseurl (;$) {
        my $page=shift;
 
-       return "$config{url}/" if ! defined $page;
+       return $local_url if ! defined $page;
        
        $page=htmlpage($page);
        $page=~s/[^\/]+$//;