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.
parent
9efe370fa0
commit
6b5b0a3282
|
@ -1931,7 +1931,7 @@ sub misctemplate ($$;@) {
|
|||
title => $title,
|
||||
wikiname => $config{wikiname},
|
||||
content => $content,
|
||||
baseurl => baseurl(),
|
||||
baseurl => $config{url},
|
||||
html5 => $config{html5},
|
||||
%params,
|
||||
);
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue