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

diff --git a/lib/apiaction.php b/lib/apiaction.php
index 420dd2a7cfbe86b1d7639fff3f1433ead79c7c4e..14e21ae4fdc15f8ad8980862bc473a57d8e16fd8 100644 (file)
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -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;