diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-02-22 22:24:45 +0100 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-02-22 22:24:45 +0100 |
| commit | 8aa8e124cbeed84d7c32668860154783a5abd5c1 (patch) | |
| tree | 7f6dbfcdc69927dea4afe4bb6b9606bf85db2f5c /plugins/OStatus/actions/ostatussub.php | |
| parent | 3c004729999f3f1a25ecb723a07af07c4b4c2bc8 (diff) | |
| parent | 06f155c02df91ae81eb4401c738815ee46b802a6 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
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 95dec19af..592ae387e 100644 --- a/plugins/OStatus/actions/ostatussub.php +++ b/plugins/OStatus/actions/ostatussub.php @@ -248,7 +248,7 @@ class OStatusSubAction extends Action $group = $this->oprofile->localGroup(); if ($user->isMember($group)) { $this->showForm(_m('Already a member!')); - } elseif (Group_member::join($this->profile->group_id, $user->id)) { + } elseif (Group_member::join($this->oprofile->group_id, $user->id)) { $this->showForm(_m('Joined remote group!')); } else { $this->showForm(_m('Remote group join failed!')); |