aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartin f. krafft <madduck@madduck.net>2008-03-11 14:00:59 +0100
committerJoey Hess <joey@kodama.kitenet.net>2008-03-11 15:53:21 -0400
commitc471d5425faa1ce813a4ce8d564bf634346746a3 (patch)
tree8e4dfad2975f122cb03ac2ba76fe20c24c855d5f
parent816d124a64e9cc928ea7caee2b54abd32eb42fa1 (diff)
downloadikiwiki-c471d5425faa1ce813a4ce8d564bf634346746a3.tar
ikiwiki-c471d5425faa1ce813a4ce8d564bf634346746a3.tar.gz
Generate openid2 headers as well
This causes meta.openid to also generate the openid2 headers. Signed-off-by: martin f. krafft <madduck@madduck.net>
-rw-r--r--IkiWiki/Plugin/meta.pm4
-rw-r--r--doc/plugins/meta.mdwn4
2 files changed, 6 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index b98864722..0c210b64d 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -140,10 +140,14 @@ 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"'.
diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index 336c79806..0a934fc5c 100644
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -64,8 +64,8 @@ Supported fields:
* openid
Adds html &lt;link&gt; tags to perform OpenID delegation to an external
- OpenID server. An optional `xrds-location` parameter lets you specify the
- location of any [eXtensible Resource
+ OpenID server (for `openid` and `openid2`). An optional `xrds-location`
+ parameter lets you specify the location of any [eXtensible Resource
DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml).
This lets you use an ikiwiki page as your OpenID. Example: