diff options
author | Evan Prodromou <evan@status.net> | 2010-02-24 15:00:52 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-02-24 15:00:52 -0500 |
commit | daea98878692cadc9406be16fe2e15a419add3c4 (patch) | |
tree | d7b5e0ec34b04c7f91c43a4e5761dc764c64330a /plugins/OStatus/actions/groupsalmon.php | |
parent | f5ec7c27070dac4ac28ba860f4cc9a808b5f7c30 (diff) | |
parent | 07214f1370547fcc64db34ce8c8a84ec70e0d5bd (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/actions/groupsalmon.php')
-rw-r--r-- | plugins/OStatus/actions/groupsalmon.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/OStatus/actions/groupsalmon.php b/plugins/OStatus/actions/groupsalmon.php index 2e4fe9443..29377b5fa 100644 --- a/plugins/OStatus/actions/groupsalmon.php +++ b/plugins/OStatus/actions/groupsalmon.php @@ -46,6 +46,11 @@ class GroupsalmonAction extends SalmonAction $this->clientError(_('No such group.')); } + $oprofile = Ostatus_profile::staticGet('group_id', $id); + if ($oprofile) { + $this->clientError(_m("Can't accept remote posts for a remote group.")); + } + return true; } @@ -74,13 +79,13 @@ class GroupsalmonAction extends SalmonAction throw new ClientException("Not to the attention of anyone."); } else { $uri = common_local_url('groupbyid', array('id' => $this->group->id)); - if (!in_array($context->attention, $uri)) { + if (!in_array($uri, $context->attention)) { throw new ClientException("Not to the attention of this group."); } } $profile = $this->ensureProfile(); - // @fixme save the post + $this->saveNotice(); } /** |