diff options
| author | Zach Copley <zach@status.net> | 2010-03-18 15:28:21 -0700 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-03-18 15:28:21 -0700 |
| commit | 109aac3c49041e9323f74d9a9660186de069176d (patch) | |
| tree | 3e8170235c4072d3a47f93aa665530028019e347 /plugins/OStatus/actions/ostatussub.php | |
| parent | e10d023d037ac9d2a628f8246dfccb4ad525ed59 (diff) | |
| parent | 69b25ba1be7a9f42a06a8297304dccc6e7ce23ec (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
Fix for xmpp/sms notification options appearing to be disabled on new subscriptions.
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. |