We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 347ba8c4 authored by Evan Prodromou's avatar Evan Prodromou

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

parents 1fdb539b 35521d4a
......@@ -958,9 +958,9 @@ class ApiAction extends Action
$to_profile = $message->getTo();
$dmsg['id'] = intval($message->id);
$dmsg['sender_id'] = intval($from_profile);
$dmsg['sender_id'] = intval($from_profile->id);
$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['sender_screen_name'] = $from_profile->nickname;
$dmsg['recipient_screen_name'] = $to_profile->nickname;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment