diff options
author | Joey Hess <joey@kitenet.net> | 2011-01-05 13:49:04 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-01-05 13:50:42 -0400 |
commit | 8c9c3915ecaf9cce4d0335f2b3c588d7f96d2b36 (patch) | |
tree | c237bd8dd6f067158f7bc3f3f5fad8d2f33fb270 /IkiWiki/CGI.pm | |
parent | a554a3d538133479b7f93f16374eb0b8923ca6ba (diff) | |
download | ikiwiki-8c9c3915ecaf9cce4d0335f2b3c588d7f96d2b36.tar ikiwiki-8c9c3915ecaf9cce4d0335f2b3c588d7f96d2b36.tar.gz |
Fix base url when previewing. Was broken by urlto changes in last release.
Added a showform_preview that is like showform, but sets forcebaseurl
to point to the page being previewed.
Diffstat (limited to 'IkiWiki/CGI.pm')
-rw-r--r-- | IkiWiki/CGI.pm | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index ede194ff9..df5179834 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -49,6 +49,24 @@ sub showform ($$$$;@) { print misctemplate($form->title, $form->render(submit => $buttons), @_); } +# Like showform, but the base url will be set to allow edit previews +# that use links relative to the specified page. +sub showform_preview ($$$$;@) { + my $form=shift; + my $buttons=shift; + my $session=shift; + my $cgi=shift; + my %params=@_; + + eval q{use URI}; + # The base url needs to be a full URL. If urlto returns relative, + # force it absolute, using the same URL scheme used for the cgi. + my $baseurl = URI->new_abs(urlto($params{page}), $cgi->url); + + showform($form, $buttons, $session, $cgi, @_, + forcebaseurl => $baseurl); +} + sub redirect ($$) { my $q=shift; eval q{use URI}; |