diff options
| author | Zach Copley <zach@status.net> | 2010-10-20 17:28:28 -0700 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-10-20 17:28:28 -0700 |
| commit | bfdb8385ecc745002b8c45510caf2fdf7c2d2c9f (patch) | |
| tree | 392196b097fafb10430bb7db763fd744a0639bf3 /actions/apioauthaccesstoken.php | |
| parent | e56385a7bb25336a72c1d37ad43d51ba8e238231 (diff) | |
| parent | 31f52ec37c5a2be76c197a9c492d3a236af045cd (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
actions/apioauthauthorize.php
lib/apioauthstore.php
Diffstat (limited to 'actions/apioauthaccesstoken.php')
| -rw-r--r-- | actions/apioauthaccesstoken.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php index d4bd493ee..f66e4af1e 100644 --- a/actions/apioauthaccesstoken.php +++ b/actions/apioauthaccesstoken.php @@ -44,7 +44,6 @@ require_once INSTALLDIR . '/lib/apioauth.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class ApiOauthAccessTokenAction extends ApiOauthAction { protected $reqToken = null; @@ -73,7 +72,6 @@ class ApiOauthAccessTokenAction extends ApiOauthAction // Spec doesn't say they MUST be. try { - $req = OAuthRequest::from_request(); $this->reqToken = $req->get_parameter('oauth_token'); @@ -101,6 +99,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction ); common_log(LOG_WARNING, $msg); + // TRANS: Client error given from the OAuth API when the request token or verifier is invalid. $this->clientError(_("Invalid request token or verifier.", 400, 'text')); } else { |