diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-09 12:41:46 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-09 12:41:46 -0800 |
| commit | 5509f923ea48aecd1422aa1a4173fc85938e2b74 (patch) | |
| tree | 36bfff4c680c2238ed9299970ecaa557d621f5cf /plugins/OStatus/actions/webfinger.php | |
| parent | cd0f288fa725aebaf6cb9ae240c2b085000f6707 (diff) | |
| parent | c2475f88539ba8053596acd17be39ad0aec98bb4 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/actions/webfinger.php')
| -rw-r--r-- | plugins/OStatus/actions/webfinger.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/plugins/OStatus/actions/webfinger.php b/plugins/OStatus/actions/webfinger.php index ec2dddd53..75ba16638 100644 --- a/plugins/OStatus/actions/webfinger.php +++ b/plugins/OStatus/actions/webfinger.php @@ -58,6 +58,13 @@ class WebfingerAction extends Action $xrd->links[] = array('rel' => 'http://webfinger.net/rel/profile-page', 'type' => 'text/html', 'href' => common_profile_url($nick)); + + $salmon_url = common_local_url('salmon', + array('id' => $this->user->id)); + + $xrd->links[] = array('rel' => 'salmon', + 'href' => $salmon_url); + // TODO - finalize where the redirect should go on the publisher $url = common_local_url('ostatussub') . '?feed={uri}'; $xrd->links[] = array('rel' => 'http://ostatus.org/schema/1.0/subscribe', |