diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-03-24 23:33:00 +0100 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-03-24 23:33:00 +0100 |
| commit | 5330e9d861a99dfee9d67160fb125ce2ef86e608 (patch) | |
| tree | 76041023a4b85c6ae9113fc9726bbe739230ff2b /plugins/OStatus/actions/usersalmon.php | |
| parent | 97e83112d249cd2fbb281da59c80d43e0fe33818 (diff) | |
| parent | ecb009bcf5a6893b90d153be18c423dd7377796d (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus/actions/usersalmon.php')
| -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, |