diff options
| author | Evan Prodromou <evan@status.net> | 2010-03-18 20:57:38 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-03-18 20:57:38 -0500 |
| commit | ac609e804078cf70fcc02b36aa1eb40115354715 (patch) | |
| tree | c206723a0fe28fd62f8d2838f589a42ec7523af5 /plugins/OStatus/actions | |
| parent | 17c50f338ceb574780476f6b788f48e2d7d06017 (diff) | |
| parent | 4a6c9e445149e42a4f81d5140296e7770c60bc6c (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
Diffstat (limited to 'plugins/OStatus/actions')
| -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. |