X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/18fa785bc62373cb8cd2147317f3f57a17c962ce..628467125c319b623af0d60dd1e2c5817db3b1d4:/IkiWiki/Plugin/meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 2df5a727c..0afe1c362 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -140,10 +140,18 @@ sub preprocess (@) { #{{{
 		if (exists $params{server} && safeurl($params{server})) {
 			push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
 				'" rel="openid.server" />';
+			push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
+				'" rel="openid2.provider" />';
 		}
 		if (safeurl($value)) {
 			push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
 				'" rel="openid.delegate" />';
+			push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
+				'" rel="openid2.local_id" />';
+		}
+		if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) {
+			push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location"'.
+				'content="'.encode_entities($params{"xrds-location"}).'" />';
 		}
 	}
 	elsif ($key eq 'redir') {
@@ -178,7 +186,7 @@ sub preprocess (@) { #{{{
 			$value=encode_entities($value);
 		}
 		my $delay=int(exists $params{delay} ? $params{delay} : 0);
-		my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\">";
+		my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />";
 		if (! $safe) {
 			$redir=scrub($redir);
 		}
@@ -195,7 +203,7 @@ sub preprocess (@) { #{{{
 	}
 	elsif ($key eq 'robots') {
 		push @{$metaheaders{$page}}, '<meta name="robots"'.
-			' value="'.encode_entities($value).'" />';
+			' content="'.encode_entities($value).'" />';
 	}
 	else {
 		push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key).