diff options
author | Zach Copley <zach@status.net> | 2010-02-05 01:13:23 +0000 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-02-05 03:18:45 +0000 |
commit | 4379027432b4d35b60649624466a4c0e2abb5271 (patch) | |
tree | 32508b138e0af90064a44dea609ee64fa206ce29 | |
parent | af9f23c2d9db2966284e5146026ec05d4bb37367 (diff) |
Fix issue with OAuth request parameters being parsed/stored twice when
calling /api/account/verify_credentials.:format
-rw-r--r-- | actions/apiaccountverifycredentials.php | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php index 1095d5162..ea61a3205 100644 --- a/actions/apiaccountverifycredentials.php +++ b/actions/apiaccountverifycredentials.php @@ -66,18 +66,21 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction { parent::handle($args); - switch ($this->format) { - case 'xml': - case 'json': - $args['id'] = $this->auth_user->id; - $action_obj = new ApiUserShowAction(); - if ($action_obj->prepare($args)) { - $action_obj->handle($args); - } - break; - default: - header('Content-Type: text/html; charset=utf-8'); - print 'Authorized'; + if (!in_array($this->format, array('xml', 'json'))) { + $this->clientError(_('API method not found.'), $code = 404); + return; + } + + $twitter_user = $this->twitterUserArray($this->auth_user->getProfile(), true); + + if ($this->format == 'xml') { + $this->initDocument('xml'); + $this->showTwitterXmlUser($twitter_user); + $this->endDocument('xml'); + } elseif ($this->format == 'json') { + $this->initDocument('json'); + $this->showJsonObjects($twitter_user); + $this->endDocument('json'); } } @@ -86,14 +89,14 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction * Is this action read only? * * @param array $args other arguments - * + * * @return boolean true * **/ - + function isReadOnly($args) { return true; } - + } |