diff options
| author | James Walker <walkah@walkah.net> | 2010-02-25 23:49:45 -0500 |
|---|---|---|
| committer | James Walker <walkah@walkah.net> | 2010-02-25 23:49:45 -0500 |
| commit | 7c8031dc4bf6ece83db893e13d89ced10c2f6b62 (patch) | |
| tree | 9b48e3d511642450ac0566b00cfb6f2d8ae109aa /plugins/OStatus/actions | |
| parent | 855692141d531287b179841b8816e90023b6ba7b (diff) | |
| parent | 02300ebfb08bfcd52f4ab34d1041455079ebf2ec (diff) | |
Merge remote branch 'statusnet/testing' into testing
Conflicts:
plugins/OStatus/lib/webfinger.php
Diffstat (limited to 'plugins/OStatus/actions')
| -rw-r--r-- | plugins/OStatus/actions/xrd.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/OStatus/actions/xrd.php b/plugins/OStatus/actions/xrd.php index cc5c70b08..2a754dcfe 100644 --- 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', |