diff options
author | Brion Vibber <brion@pobox.com> | 2010-02-26 12:33:50 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-02-26 12:33:50 -0800 |
commit | 9b366547d743b9c85455e02cae2f84a658a4baf2 (patch) | |
tree | 815817fdd6a88f9cac18de9f8be0544bb8df3a80 /plugins/OStatus/actions/xrd.php | |
parent | 517fd54b6515375b075a5d7253a8b66e53785baa (diff) | |
parent | 88ae7f53bb4470a899678d231cecb8cb963b2075 (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus/actions/xrd.php')
-rw-r--r-- | plugins/OStatus/actions/xrd.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/OStatus/actions/xrd.php b/plugins/OStatus/actions/xrd.php index e6b694d61..f574b60ee 100644 --- a/plugins/OStatus/actions/xrd.php +++ b/plugins/OStatus/actions/xrd.php @@ -80,10 +80,14 @@ class XrdAction extends Action 'href' => common_local_url('foaf', array('nickname' => $nick))); - $salmon_url = common_local_url('salmon', + // Salmon + $salmon_url = common_local_url('usersalmon', array('id' => $this->user->id)); - $xrd->links[] = array('rel' => 'salmon', + $xrd->links[] = array('rel' => Salmon::NS_REPLIES, + 'href' => $salmon_url); + + $xrd->links[] = array('rel' => Salmon::NS_MENTIONS, 'href' => $salmon_url); // Get this user's keypair @@ -95,7 +99,7 @@ class XrdAction extends Action } $xrd->links[] = array('rel' => Magicsig::PUBLICKEYREL, - 'href' => 'data:application/magic-public-key;'. $magickey->keypair); + 'href' => 'data:application/magic-public-key;'. $magickey->toString(false)); // TODO - finalize where the redirect should go on the publisher $url = common_local_url('ostatussub') . '?profile={uri}'; |