Merge branch '3022' into testing

diff --combined lib/apiaction.php
index 0b539bb397a5a27f929469cfb6dd4c96a2801745,6caf468bf2324ddc87f2714d9ab0321dcc102aad..b6e8f87b6de0337b71feafce6f44291d5b3ee620
--- 1/lib/apiaction.php
--- 2/lib/apiaction.php
+++ b/lib/apiaction.php
@@@ -412,7 -412,7 +412,7 @@@ class ApiAction extends Actio
      {
          $twitter_group = array();
  
 -        $twitter_group['id'] = $group->id;
 +        $twitter_group['id'] = intval($group->id);
          $twitter_group['url'] = $group->permalink();
          $twitter_group['nickname'] = $group->nickname;
          $twitter_group['fullname'] = $group->fullname;
@@@ -561,7 -561,7 +561,7 @@@
  
          $details['notifications_enabled'] = $notifications;
          $details['blocking'] = $source->hasBlocked($target);
 -        $details['id'] = $source->id;
 +        $details['id'] = intval($source->id);
  
          return $details;
      }
@@@ -945,10 -945,10 +945,10 @@@
          $from_profile = $message->getFrom();
          $to_profile = $message->getTo();
  
 -        $dmsg['id'] = $message->id;
 -        $dmsg['sender_id'] = $message->from_profile;
 +        $dmsg['id'] = intval($message->id);
 +        $dmsg['sender_id'] = intval($from_profile);
          $dmsg['text'] = trim($message->content);
 -        $dmsg['recipient_id'] = $message->to_profile;
 +        $dmsg['recipient_id'] = intval($to_profile);
          $dmsg['created_at'] = $this->dateTwitter($message->created);
          $dmsg['sender_screen_name'] = $from_profile->nickname;
          $dmsg['recipient_screen_name'] = $to_profile->nickname;
@@@ -1236,9 -1236,12 +1236,12 @@@
          return;
      }
  
-     function clientError($msg, $code = 400, $format = 'xml')
+     function clientError($msg, $code = 400, $format = null)
      {
          $action = $this->trimmed('action');
+         if ($format === null) {
+             $format = $this->format;
+         }
  
          common_debug("User error '$code' on '$action': $msg", __FILE__);
  
@@@ -1278,9 -1281,12 +1281,12 @@@
          }
      }
  
-     function serverError($msg, $code = 500, $content_type = 'xml')
+     function serverError($msg, $code = 500, $content_type = null)
      {
          $action = $this->trimmed('action');
+         if ($content_type === null) {
+             $content_type = $this->format;
+         }
  
          common_debug("Server error '$code' on '$action': $msg", __FILE__);