diff options
author | Evan Prodromou <evan@status.net> | 2010-08-13 14:33:41 -0700 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-08-13 14:33:41 -0700 |
commit | 718317542940a8976f2c6f2a9ea09a04f2f00ca6 (patch) | |
tree | 2bae1e1b0ce628101453b83c7e4ddcce59b43c62 /plugins/OStatus/actions/groupsalmon.php | |
parent | 9f0715a9935966f3ec483bccc476d5baf3324b3c (diff) | |
parent | 029aa0c61c9942c0688fd3dc9aa2893311543db1 (diff) |
Merge branch 'master' into 1.0.x
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."); |