Close meta tag for redir properly.

[ikiwiki.git] / IkiWiki / Plugin / meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 2df5a727c08b28a029127f1fdff5b368ed56c7a1..0afe1c3622561654bf682df6ea2e6d5b9551f135 100644 (file)
--- 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).