summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorJames Walker <walkah@walkah.net>2010-02-26 03:43:35 -0500
committerJames Walker <walkah@walkah.net>2010-02-26 03:43:35 -0500
commitd1256b547f5f4f02ddc51a5fe2146dbde52aac53 (patch)
tree9a8a15f46b4ae7cfeb1a820b14a03fa19c6f84ec /plugins
parent22062b665e6d883f5ddfe590af1b9b22833094b0 (diff)
bad merge.. cleaning up missing webfinger bits
Diffstat (limited to 'plugins')
-rw-r--r--plugins/OStatus/actions/xrd.php2
-rw-r--r--plugins/OStatus/lib/discovery.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/OStatus/actions/xrd.php b/plugins/OStatus/actions/xrd.php
index 2a754dcfe..e6b694d61 100644
--- a/plugins/OStatus/actions/xrd.php
+++ b/plugins/OStatus/actions/xrd.php
@@ -66,7 +66,7 @@ class XrdAction extends Action
'type' => 'application/atom+xml');
// hCard
- $xrd->links[] = array('rel' => Webfinger::HCARD,
+ $xrd->links[] = array('rel' => Discovery::HCARD,
'type' => 'text/html',
'href' => common_local_url('hcard', array('nickname' => $nick)));
diff --git a/plugins/OStatus/lib/discovery.php b/plugins/OStatus/lib/discovery.php
index c268ad05c..1ab6e51bd 100644
--- a/plugins/OStatus/lib/discovery.php
+++ b/plugins/OStatus/lib/discovery.php
@@ -39,7 +39,8 @@ class Discovery
const LRDD_REL = 'lrdd';
const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from';
-
+ const HCARD = 'http://microformats.org/profile/hcard';
+
public $methods = array();
public function __construct()