diff options
| author | Evan Prodromou <evan@status.net> | 2010-03-25 13:50:49 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-03-25 13:50:49 -0400 |
| commit | 920acf8d966a11b7c461c333b3a5d3c82d9c8d75 (patch) | |
| tree | 396dc88352d080b5ac98f7785be18a81b7eb01e2 /plugins/OStatus/actions | |
| parent | ad608ab9add1615d6aae3fde239e54d1eb36b0ca (diff) | |
| parent | a954fd65ba00328cd1a76e620113d2f639340aaf (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/actions')
| -rw-r--r-- | plugins/OStatus/actions/usersalmon.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php index ecdcfa193..6c360c49f 100644 --- a/plugins/OStatus/actions/usersalmon.php +++ b/plugins/OStatus/actions/usersalmon.php @@ -92,7 +92,7 @@ class UsersalmonAction extends SalmonAction throw new ClientException("Not to anyone in reply to anything!"); } - $existing = Notice::staticGet('uri', $this->act->object->id); + $existing = Notice::staticGet('uri', $this->act->objects[0]->id); if (!empty($existing)) { common_log(LOG_ERR, "Not saving notice '{$existing->uri}'; already exists."); @@ -143,7 +143,7 @@ class UsersalmonAction extends SalmonAction function handleFavorite() { - $notice = $this->getNotice($this->act->object); + $notice = $this->getNotice($this->act->objects[0]); $profile = $this->ensureProfile()->localProfile(); $old = Fave::pkeyGet(array('user_id' => $profile->id, @@ -164,7 +164,7 @@ class UsersalmonAction extends SalmonAction */ function handleUnfavorite() { - $notice = $this->getNotice($this->act->object); + $notice = $this->getNotice($this->act->objects[0]); $profile = $this->ensureProfile()->localProfile(); $fave = Fave::pkeyGet(array('user_id' => $profile->id, |