better handling of relative permalinks

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index df51798344cf00b23bea94ddad30bb6682f9a670..f1bec6b8fc3a7d18f02a1b7ee2bacbe990af7381 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -58,10 +58,8 @@ sub showform_preview ($$$$;@) {
        my $cgi=shift;
        my %params=@_;
 
-       eval q{use URI};
-       # The base url needs to be a full URL. If urlto returns relative,
-       # force it absolute, using the same URL scheme used for the cgi.
-       my $baseurl = URI->new_abs(urlto($params{page}), $cgi->url);
+       # The base url needs to be a full URL, and urlto may return a path.
+       my $baseurl = urlabs(urlto($params{page}), $cgi->url);
 
        showform($form, $buttons, $session, $cgi, @_,
                forcebaseurl => $baseurl);
@@ -70,7 +68,7 @@ sub showform_preview ($$$$;@) {
 sub redirect ($$) {
        my $q=shift;
        eval q{use URI};
-       my $url=URI->new(shift);
+       my $url=URI->new(urlabs(shift, $q->url));
        if (! $config{w3mmode}) {
                print $q->redirect($url);
        }