bad merge.. cleaning up missing webfinger bits

diff --git a/plugins/OStatus/actions/xrd.php b/plugins/OStatus/actions/xrd.php
index 2a754dcfef7d8b7d11bcb7fcb73f302b725fb6ab..e6b694d61b083eb9d4167afd3d7289d9c413fcd9 100644 (file)
--- 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 c268ad05c7e96098edd405027969fcdc256da79c..1ab6e51bda499b87e06095a6d0eebc66da5a6884 100644 (file)
--- 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()