X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=IkiWiki%2FCGI.pm;h=62383b6fd22cf3ca6bed2dc3571f5cafb3c10715;hb=1d951583a6d3718ea5e44b8c52fb2acbe5a989e8;hp=30d108a81ca7be4bac8081040dbb1a5608f1436c;hpb=4a6ac6b485c7e6e312e42c3c609df693f5e531ec;p=ikiwiki.git

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 30d108a81..62383b6fd 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -12,7 +12,7 @@ use Encode;
 sub printheader ($) {
 	my $session=shift;
 	
-	if ($ENV{HTTPS} || $config{sslcookie}) {
+	if (($ENV{HTTPS} && lc $ENV{HTTPS} ne "off") || $config{sslcookie}) {
 		print $session->header(-charset => 'utf-8',
 			-cookie => $session->cookie(-httponly => 1, -secure => 1));
 	}
@@ -79,7 +79,7 @@ sub cgitemplate ($$$;@) {
 		title => $title,
 		wikiname => $config{wikiname},
 		content => $content,
-		baseurl => urlabs(urlto(undef), $topurl),
+		baseurl => urlabs(baseurl(), $topurl),
 		html5 => $config{html5},
 		%params,
 	);
@@ -429,7 +429,7 @@ sub cgi (;$$) {
 			# userinfo db.
 			if (! userinfo_get($session->param("name"), "regdate")) {
 				userinfo_setall($session->param("name"), {
-					email => "",
+					email => defined $session->param("email") ? $session->param("email") : "",
 					password => "",
 					regdate => time,
 				}) || error("failed adding user");