diff options
author | Evan Prodromou <evan@status.net> | 2010-08-14 11:46:12 -0700 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-08-14 11:46:12 -0700 |
commit | 9e4f40806a2fc4769a4dcc37d1ff337a1d02d8d4 (patch) | |
tree | da34091d658d989ab30e7d2baca71c4f77a1e0b7 /plugins/OStatus/actions/groupsalmon.php | |
parent | 9b7536351b1efa5bf222fad1fb92b6dc9e33156f (diff) | |
parent | 029aa0c61c9942c0688fd3dc9aa2893311543db1 (diff) |
Merge branch 'master' into noticetitle
Diffstat (limited to 'plugins/OStatus/actions/groupsalmon.php')
-rw-r--r-- | plugins/OStatus/actions/groupsalmon.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/OStatus/actions/groupsalmon.php b/plugins/OStatus/actions/groupsalmon.php index d60725a71..5094dccf0 100644 --- a/plugins/OStatus/actions/groupsalmon.php +++ b/plugins/OStatus/actions/groupsalmon.php @@ -61,7 +61,7 @@ class GroupsalmonAction extends SalmonAction function handlePost() { // @fixme process all objects? - switch ($this->act->objects[0]->type) { + switch ($this->activity->objects[0]->type) { case ActivityObject::ARTICLE: case ActivityObject::BLOGENTRY: case ActivityObject::NOTE: @@ -74,7 +74,7 @@ class GroupsalmonAction extends SalmonAction // Notice must be to the attention of this group - $context = $this->act->context; + $context = $this->activity->context; if (empty($context->attention)) { throw new ClientException("Not to the attention of anyone."); |