summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-01-05 15:01:31 -0400
committerJoey Hess <joey@kitenet.net>2011-01-05 15:01:31 -0400
commit6b5b0a3282a1409476beb498030e035c5b462440 (patch)
treed1f41385cd72f1b0543e3637379b6ee26c30cb9e
parent9efe370fa032791123e84a77d021eb89bbc7b91c (diff)
Temporarily revert one part of the multiple url support in the last release. Non-edit pages are now back to having `<base>` set to the site's main url.
-rw-r--r--IkiWiki.pm2
-rw-r--r--debian/changelog3
-rw-r--r--doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn13
3 files changed, 10 insertions, 8 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1102fa52a..3a4cfd5e7 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1931,7 +1931,7 @@ sub misctemplate ($$;@) {
title => $title,
wikiname => $config{wikiname},
content => $content,
- baseurl => baseurl(),
+ baseurl => $config{url},
html5 => $config{html5},
%params,
);
diff --git a/debian/changelog b/debian/changelog
index f9468f1c7..33e5e1fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ ikiwiki (3.20101232) UNRELEASED; urgency=low
* 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.
+ * Temporarily revert one part of the multiple url support in the last
+ release. Non-edit pages are now back to having `<base>` set to
+ the site's main url.
-- Joey Hess <joeyh@debian.org> Tue, 04 Jan 2011 16:00:55 -0400
diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
index 55ff67d0c..260aecdbd 100644
--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -4,17 +4,16 @@
* CGI pages, with the exception of edit pages, set `<base>` to
`$config{url}`
-* When doing a Logout or Cancel, or when saving an edited page,
- the user is returned to something derived from `$config{url}`.
-* RecentChanges page may link to things derived from `$config{url}`.
-All of the above are because I had to revert `baseurl(undef)` to always
-returning an absolute url, since relative urls caused breakage as seen in
-[[preview_base_url_should_be_absolute]]. --[[Joey]]
+I had to revert using `baseurl(undef)` for that, because it needs
+to be a full url.
Ideally, baseurl would return an absolute url derived from the url
being used to access the cgi, but that needs access to the CGI object,
-which it does not have. --[[Joey]]
+which it does not currently have. Similarly, `misctemplate`
+does not have access to the CGI object, so it cannot use it to
+generate a better baseurl. Not sure yet what to do; may have to thread
+a cgi parameter through all the calls to misctemplate. --[[Joey]]
## old attempt