summaryrefslogtreecommitdiff
path: root/plugins/OStatus/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-23 16:02:27 -0500
committerEvan Prodromou <evan@status.net>2010-02-23 16:02:27 -0500
commitb09304a6c4553044983176fb2740206777868378 (patch)
tree612381c27789be05070d4e7ca03d8f05fff58d5e /plugins/OStatus/actions
parenta0c255e231a84cf77554cc3c0a095eae7b0ffd9c (diff)
parent90d34b26c66ceb5d37a9c2782356b46361a523cc (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts: plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'plugins/OStatus/actions')
-rw-r--r--plugins/OStatus/actions/ostatussub.php5
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)) {