Merge remote branch 'statusnet/testing' into testing

[quix0rs-gnu-social.git] / plugins / OStatus / actions / xrd.php

diff --git a/plugins/OStatus/actions/xrd.php b/plugins/OStatus/actions/xrd.php
index cc5c70b08ed646d74c826c8d268df065b798b09f..2a754dcfef7d8b7d11bcb7fcb73f302b725fb6ab 100644 (file)
--- a/plugins/OStatus/actions/xrd.php
+++ b/plugins/OStatus/actions/xrd.php
@@ -66,9 +66,9 @@ class XrdAction extends Action
                               'type' => 'application/atom+xml');
 
         // hCard
-        $xrd->links[] = array('rel' => 'http://microformats.org/profile/hcard',
+        $xrd->links[] = array('rel' => Webfinger::HCARD,
                               'type' => 'text/html',
-                              'href' => common_profile_url($nick));
+                              'href' => common_local_url('hcard', array('nickname' => $nick)));
 
         // XFN
         $xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11',
@@ -78,8 +78,8 @@ class XrdAction extends Action
         $xrd->links[] = array('rel' => 'describedby',
                               'type' => 'application/rdf+xml',
                               'href' => common_local_url('foaf',
-                                                         array('nickname' => $nick)));                        
-        
+                                                         array('nickname' => $nick)));
+
         $salmon_url = common_local_url('salmon',
                                        array('id' => $this->user->id));
 
@@ -93,10 +93,10 @@ class XrdAction extends Action
             $magickey = new Magicsig();
             $magickey->generate($this->user->id);
         }
-        
+
         $xrd->links[] = array('rel' => Magicsig::PUBLICKEYREL,
                               'href' => 'data:application/magic-public-key;'. $magickey->keypair);
-        
+
         // TODO - finalize where the redirect should go on the publisher
         $url = common_local_url('ostatussub') . '?profile={uri}';
         $xrd->links[] = array('rel' => 'http://ostatus.org/schema/1.0/subscribe',