diff options
| -rw-r--r-- | actions/twitapidirect_messages.php | 2 | ||||
| -rw-r--r-- | actions/twitapiusers.php | 2 | ||||
| -rw-r--r-- | lib/twitterapi.php | 18 |
3 files changed, 7 insertions, 15 deletions
diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php index 8f0ecb449..fcdf822e0 100644 --- a/actions/twitapidirect_messages.php +++ b/actions/twitapidirect_messages.php @@ -215,7 +215,7 @@ class Twitapidirect_messagesAction extends TwitterapiAction { } } - $this->show_twitter_json_dmsgs($dmsgs); + $this->show_json_objects($dmsgs); $this->end_document('json'); } diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php index 6dad53818..cb682695a 100644 --- a/actions/twitapiusers.php +++ b/actions/twitapiusers.php @@ -116,7 +116,7 @@ class TwitapiusersAction extends TwitterapiAction { $this->end_document('xml'); } elseif ($apidata['content-type'] == 'json') { $this->init_document('json'); - $this->show_twitter_json_users($twitter_user); + $this->show_json_objects($twitter_user); $this->end_document('json'); } else { common_user_error(_('API method not found!'), $code = 404); diff --git a/lib/twitterapi.php b/lib/twitterapi.php index 98d094cfe..d6ec1e9a0 100644 --- a/lib/twitterapi.php +++ b/lib/twitterapi.php @@ -185,16 +185,8 @@ class TwitterapiAction extends Action { common_element_end('entry'); } - function show_twitter_json_statuses($twitter_statuses) { - print(json_encode($twitter_statuses)); - } - - function show_twitter_json_users($twitter_users) { - print(json_encode($twitter_users)); - } - - function show_twitter_json_dmsgs($twitter_dms) { - print(json_encode($twitter_dms)); + function show_json_objects($objects) { + print(json_encode($objects)); } function show_single_xml_status($notice) { @@ -208,7 +200,7 @@ class TwitterapiAction extends Action { function show_single_json_status($notice) { $this->init_document('json'); $status = $this->twitter_status_array($notice); - $this->show_twitter_json_statuses($status); + $this->show_json_objects($status); $this->end_document('json'); exit(); } @@ -331,7 +323,7 @@ class TwitterapiAction extends Action { } } - $this->show_twitter_json_statuses($statuses); + $this->show_json_objects($statuses); $this->end_document('json'); } @@ -507,7 +499,7 @@ class TwitterapiAction extends Action { $this->show_twitter_xml_user($profile_array); break; case 'json': - $this->show_twitter_json_users($profile_array); + $this->show_json_objects($profile_array); break; default: $this->client_error(_('Not a supported data format.')); |