diff options
| -rw-r--r-- | actions/twitapistatuses.php | 21 | ||||
| -rw-r--r-- | lib/twitterapi.php | 22 |
2 files changed, 21 insertions, 22 deletions
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php index 6a63dd037..66d3737fd 100644 --- a/actions/twitapistatuses.php +++ b/actions/twitapistatuses.php @@ -530,6 +530,27 @@ class TwitapistatusesAction extends TwitterapiAction { } + function show($args, $apidata) { + parent::handle($args); + + $notice_id = $apidata['api_arg']; + $notice = Notice::staticGet($notice_id); + + if ($notice) { + if ($apidata['content-type'] == 'xml') { + $this->show_single_xml_status($notice); + } elseif ($apidata['content-type'] == 'json') { + $this->show_single_json_status($notice); + } + } else { + + // XXX: This is all that Twitter does. It doesn't show an XML or JSON error msg. + // Should we call client_error() to be more consistent? + header('HTTP/1.1 404 Not Found'); + } + + exit(); + } /* diff --git a/lib/twitterapi.php b/lib/twitterapi.php index f06c1d188..096dee269 100644 --- a/lib/twitterapi.php +++ b/lib/twitterapi.php @@ -150,28 +150,6 @@ class TwitterapiAction extends Action { function show_twitter_json_users($twitter_users) { print(json_encode($twitter_users)); } - - function show($args, $apidata) { - parent::handle($args); - - $id = $apidata['api_arg']; - $notice = Notice::staticGet($id); - - if ($notice) { - if ($apidata['content-type'] == 'xml') { - $this->show_single_xml_status($notice); - } elseif ($apidata['content-type'] == 'json') { - $this->show_single_json_status($notice); - } - } else { - - // XXX: This is all that Twitter does. It doesn't show an XML or JSON error msg. - // Should we call client_error() to be more consistent? - header('HTTP/1.1 404 Not Found'); - } - - exit(); - } function show_single_xml_status($notice) { $this->init_document('xml'); |