X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/4c224ae143ebc4b13f824fe1782561a5cd165864..3f4ec334df4cc2c169edfbcef3fa530cbae0d7f1:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ee0b1f1ea..97946bfcf 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -566,6 +566,9 @@ sub checkconfig () {
 
 		$local_url =~ s{//$}{/};
 	}
+	else {
+		$local_cgiurl = $config{cgiurl};
+	}
 
 	$config{wikistatedir}="$config{srcdir}/.ikiwiki"
 		unless exists $config{wikistatedir} && defined $config{wikistatedir};
@@ -1131,7 +1134,7 @@ sub beautify_urlpath ($) {
 	return $url;
 }
 
-sub urlto ($$;$) {
+sub urlto ($;$$) {
 	my $to=shift;
 	my $from=shift;
 	my $absolute=shift;
@@ -1242,7 +1245,7 @@ sub userpage ($) {
 sub openiduser ($) {
 	my $user=shift;
 
-	if ($user =~ m!^https?://! &&
+	if (defined $user && $user =~ m!^https?://! &&
 	    eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
 		my $display;