Fix broken baseurl in cgi mode when usedirs is disabled. Bug introduced in 3.20101231.

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index f8617bfc63ca63f51a8f51c135c96641947faf7d..cb4f395a063076a64e0c33e95d220f2f8581602f 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -79,7 +79,7 @@ sub cgitemplate ($$$;@) {
                title => $title,
                wikiname => $config{wikiname},
                content => $content,
-               baseurl => urlabs(urlto(""), $topurl),
+               baseurl => urlabs(baseurl(), $topurl),
                html5 => $config{html5},
                %params,
        );

diff --git a/debian/changelog b/debian/changelog
index c2243572c41844ed21412dac4822bc9c93e460b8..58297147068b9f2c8db2db90dea6d4adecaa96b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ ikiwiki (3.20110125) UNRELEASED; urgency=low
   * recentchanges: Use transient underlay (smcv)
   * map: Avoid unnecessary ul's in maps with nested directories.
     (Giuseppe Bilotta)
+  * Fix broken baseurl in cgi mode when usedirs is disabled. Bug introduced
+    in 3.20101231.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 01 Feb 2011 21:00:57 -0400