diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-23 20:44:27 +0000 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-23 20:44:27 +0000 |
| commit | 90d34b26c66ceb5d37a9c2782356b46361a523cc (patch) | |
| tree | 2882722b42779e468bcf8ab2d074d506a5ee2f52 /plugins/OStatus/actions | |
| parent | c79c70ea2c2dadafa72c65dc4593a66fecb070e3 (diff) | |
OStatus: do PuSH subscription setup from subscribe/join event hooks, so resubscribing directly from a profile/group list works correctly if there aren't active subscriptions at the moment.
Diffstat (limited to 'plugins/OStatus/actions')
| -rw-r--r-- | plugins/OStatus/actions/ostatussub.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php index df9aa80b0..b3569e695 100644 --- a/plugins/OStatus/actions/ostatussub.php +++ b/plugins/OStatus/actions/ostatussub.php @@ -324,11 +324,6 @@ class OStatusSubAction extends Action // And subscribe the current user to the local profile $user = common_current_user(); - if (!$this->oprofile->subscribe()) { - $this->showForm(_m("Failed to set up server-to-server subscription.")); - return; - } - if ($this->oprofile->isGroup()) { $group = $this->oprofile->localGroup(); if ($user->isMember($group)) { |