X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/252804628d7297f756f8587d78a07a61fc00846e..67e778f461ed0f5da0a109573b57d9f1022bcf9e:/IkiWiki/CGI.pm?ds=sidebyside diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index cb83319e6..0224c2aac 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -58,12 +58,18 @@ sub cgitemplate ($$$;@) { my $template=template("page.tmpl"); - my $topurl = defined $cgi ? $cgi->url : $config{url}; + my $topurl = $config{url}; + if (defined $cgi && ! $config{w3mmode} && ! $config{reverse_proxy}) { + $topurl = $cgi->url; + } my $page=""; if (exists $params{page}) { $page=delete $params{page}; - $params{forcebaseurl}=urlabs(urlto($page), $topurl); + $params{forcebaseurl}=urlto($page); + if (! $config{html5}) { + $params{forcebaseurl}=urlabs($params{forcebaseurl}, $topurl); + } } run_hooks(pagetemplate => sub { shift->( @@ -74,12 +80,17 @@ sub cgitemplate ($$$;@) { }); templateactions($template, ""); + my $baseurl = baseurl(); + if (! $config{html5}) { + $baseurl = urlabs($baseurl, $topurl), + } + $template->param( dynamic => 1, title => $title, wikiname => $config{wikiname}, content => $content, - baseurl => urlabs(baseurl(), $topurl), + baseurl => $baseurl, html5 => $config{html5}, %params, ); @@ -90,7 +101,13 @@ sub cgitemplate ($$$;@) { sub redirect ($$) { my $q=shift; eval q{use URI}; - my $url=URI->new(urlabs(shift, $q->url)); + + my $topurl; + if (defined $q && ! $config{w3mmode} && ! $config{reverse_proxy}) { + $topurl = $q->url; + } + + my $url=URI->new(urlabs(shift, $topurl)); if (! $config{w3mmode}) { print $q->redirect($url); }