X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/47ee266163202f15fca3b108fad294bec262405a..9f9bc5607edd1d9be81459c4a384a53c4ac45df6:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index db2605672..8172552cb 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -613,33 +613,10 @@ sub htmllink ($$$;@) { #{{{
 	return "<a href=\"$bestlink\"@attrs>$linktext</a>";
 } #}}}
 
-sub openiduser ($) { #{{{
-	my $user=shift;
-
-	if ($user =~ m!^https?://! &&
-	    eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
-		my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
-		my $display=$oid->display;
-		# Convert "user.somehost.com" to "user [somehost.com]".
-		if ($display !~ /\[/) {
-			$display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
-		}
-		# Convert "http://somehost.com/user" to "user [somehost.com]".
-		if ($display !~ /\[/) {
-			$display=~s/^https?:\/\/(.+)\/([^\/]+)$/$2 [$1]/;
-		}
-		$display=~s!^https?://!!; # make sure this is removed
-		eval q{use CGI 'escapeHTML'};
-		error($@) if $@;
-		return escapeHTML($display);
-	}
-	return;
-}
-
 sub userlink ($) { #{{{
 	my $user=shift;
 
-	my $oiduser=openiduser($user);
+	my $oiduser=eval { openiduser($user) };
 	if (defined $oiduser) {
 		return "<a href=\"$user\">$oiduser</a>";
 	}
@@ -907,7 +884,7 @@ sub loadindex () { #{{{
 	%oldrenderedfiles=%pagectime=();
 	if (! $config{rebuild}) {
 		%pagesources=%pagemtime=%oldlinks=%links=%depends=
-			%destsources=%renderedfiles=%pagecase=();
+			%destsources=%renderedfiles=%pagecase=%pagestate=();
 	}
 	open (my $in, "<", "$config{wikistatedir}/index") || return;
 	while (<$in>) {
@@ -973,7 +950,7 @@ sub saveindex () { #{{{
 		if (exists $pagestate{$page}) {
 			foreach my $id (@hookids) {
 				foreach my $key (keys %{$pagestate{$page}{$id}}) {
-					$line.=' '.$id.'_'.encode_entities($key)."=".encode_entities($pagestate{$page}{$id}{$key});
+					$line.=' '.$id.'_'.encode_entities($key)."=".encode_entities($pagestate{$page}{$id}{$key}, " \t\n");
 				}
 			}
 		}