GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of gitorious.org:statusnet/mainline

Browse Source
This commit is contained in:
Evan Prodromou 2012-04-16 15:43:28 -04:00
commit 347ba8c4a3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/apiaction.php
View File

@ -958,9 +958,9 @@ class ApiAction extends Action
$to_profile = $message->getTo(); $to_profile = $message->getTo();
$dmsg['id'] = intval($message->id); $dmsg['id'] = intval($message->id);
$dmsg['sender_id'] = intval($from_profile); $dmsg['sender_id'] = intval($from_profile->id);
$dmsg['text'] = trim($message->content); $dmsg['text'] = trim($message->content);
$dmsg['recipient_id'] = intval($to_profile); $dmsg['recipient_id'] = intval($to_profile->id);
$dmsg['created_at'] = $this->dateTwitter($message->created); $dmsg['created_at'] = $this->dateTwitter($message->created);
$dmsg['sender_screen_name'] = $from_profile->nickname; $dmsg['sender_screen_name'] = $from_profile->nickname;
$dmsg['recipient_screen_name'] = $to_profile->nickname; $dmsg['recipient_screen_name'] = $to_profile->nickname;