Fix redirect to use a full url.

Was broken (in theory) by baseurl changes in last release.

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index df51798344cf00b23bea94ddad30bb6682f9a670..bdd190d4b035cb986ef500e2f0af6e5226a7b7e6 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -58,19 +58,27 @@ 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 = absurl(urlto($params{page}), $cgi->url);
 
        showform($form, $buttons, $session, $cgi, @_,
                forcebaseurl => $baseurl);
 }
 
+# Forces a partial url (path only) to absolute, using the same
+# URL scheme as the CGI. Full URLs are left unchanged.
+sub absurl ($$) {
+       my $partialurl=shift;
+       my $q=shift;
+
+       eval q{use URI};
+       return URI->new_abs($partialurl, $q);
+}
+
 sub redirect ($$) {
        my $q=shift;
        eval q{use URI};
-       my $url=URI->new(shift);
+       my $url=URI->new(absurl(shift, $q));
        if (! $config{w3mmode}) {
                print $q->redirect($url);
        }

diff --git a/debian/changelog b/debian/changelog
index baf3e19060469e084ac9036646531c2fbc0f7a57..f9468f1c7d65314bda60e032d695d776fd2a6970 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ ikiwiki (3.20101232) UNRELEASED; urgency=low
   * tag: Do not include tagbase in rss/atom category tags. (Giuseppe Bilotta)
   * tag: Improve display of tags with a slash in their names.
     (Giuseppe Bilotta)
-  * Fix base url when previewing. Was broken by urlto changes in last release.
+  * Fix base url when previewing. Was broken by base changes in last release.
+  * Fix redirect to use a full url. Was broken (in theory) by baseurl
+    changes in last release.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 04 Jan 2011 16:00:55 -0400