From: Joey Hess <joey@kitenet.net>
Date: Mon, 21 Feb 2011 18:57:15 +0000 (-0400)
Subject: Fix broken baseurl in cgi mode when usedirs is disabled. Bug introduced in 3.20101231.
X-Git-Tag: 3.20110225~41
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/04498cdeb486a518ef9ed2464cb95f734b48c6bd?ds=sidebyside;hp=4524853fa741b0c164211a38d95c549062b3c3f1

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 f8617bfc6..cb4f395a0 100644
--- 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 c2243572c..582971470 100644
--- 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