From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 12 Mar 2008 14:35:56 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.41~151
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/db0d6c5f012bb2f4bc1df5cd1a032e7469a8d331?hp=972570b236618b2becf3b8fd5b9e85e4e5e88b7d

Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
---

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 0c210b64d..8a9a5382b 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -149,9 +149,9 @@ sub preprocess (@) { #{{{
 			push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
 				'" rel="openid2.local_id" />';
 		}
-		if (exists $params{xrds-location} && safeurl($params{xrds-location})) {
+		if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) {
 			push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location"'.
-				'content="'.encode_entities($params{xrds-location}).'" />';
+				'content="'.encode_entities($params{"xrds-location"}).'" />';
 		}
 	}
 	elsif ($key eq 'redir') {
@@ -203,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).