Avoid mixed content when cgiurl is https but url is not

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index cb83319e62ee893d92fd1d5f64695c23144d2614..b6f47a3a7f73c2e0c8cba26f859ea47b334a8ad9 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -58,7 +58,10 @@ sub cgitemplate ($$$;@) {
        
        my $template=template("page.tmpl");
 
-       my $topurl = defined $cgi ? $cgi->url : $config{url};
+       my $topurl = $config{url};
+       if (defined $cgi && ! $config{w3mmode}) {
+               $topurl = $cgi->url;
+       }
 
        my $page="";
        if (exists $params{page}) {