diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-18 17:19:28 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-18 17:19:28 -0700 |
| commit | 3e2e88b0dfb0f5b3baa336a9b3f69e8e8244c8e6 (patch) | |
| tree | 7de5edd8b9c74d5a29f7443b1a52a269f5f9d6e3 /plugins/OStatus/actions/ostatussub.php | |
| parent | 9c5af9a38f82afee92a78303aaa4604794ef6866 (diff) | |
| parent | 01a1e882afeb78542b02e4643c5d8a2fa50c2206 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus/actions/ostatussub.php')
| -rw-r--r-- | plugins/OStatus/actions/ostatussub.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php index 07081c2c6..994af6e95 100644 --- a/plugins/OStatus/actions/ostatussub.php +++ b/plugins/OStatus/actions/ostatussub.php @@ -299,7 +299,7 @@ class OStatusSubAction extends Action if ($user->isSubscribed($local)) { // TRANS: OStatus remote subscription dialog error. $this->showForm(_m('Already subscribed!')); - } elseif ($this->oprofile->subscribeLocalToRemote($user)) { + } elseif (Subscription::start($user, $local)) { $this->success(); } else { // TRANS: OStatus remote subscription dialog error. |