diff options
| author | Joey Hess <joey@kitenet.net> | 2011-02-21 14:57:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-02-21 14:57:15 -0400 |
| commit | 04498cdeb486a518ef9ed2464cb95f734b48c6bd (patch) | |
| tree | afecc4d4ed648404f13b6c6f941f00dd57c72baf | |
| parent | 4524853fa741b0c164211a38d95c549062b3c3f1 (diff) | |
Fix broken baseurl in cgi mode when usedirs is disabled. Bug introduced in 3.20101231.
| -rw-r--r-- | IkiWiki/CGI.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
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 |