correct order of params in get_token

darcs-hash:20080605025152-84dde-54da3eba220432b71d14ef7cfd4a8a7bf664316f.gz
This commit is contained in:
Evan Prodromou 2008-06-04 22:51:52 -04:00
parent b42c09c66f
commit 2bf7717ddd

View File

@ -340,8 +340,9 @@ class UserauthorizationAction extends Action {
$this->check_nonce($datastore, $req, $consumer, $token); $this->check_nonce($datastore, $req, $consumer, $token);
common_debug('checking signature', __FILE__); common_debug('checking signature', __FILE__);
$this->check_signature($req, $consumer, $token); $this->check_signature($req, $consumer, $token);
common_debug('checking signature', __FILE__); common_debug('validating omb stuff', __FILE__);
$this->validate_omb($req); $this->validate_omb($req);
common_debug('done validating', __FILE__);
return true; return true;
} }
@ -440,7 +441,7 @@ class UserauthorizationAction extends Action {
# Mostly cadged from OAuthServer # Mostly cadged from OAuthServer
function get_token(&$req, $consumer, $datastore) {/*{{{*/ function get_token($datastore, &$req, $consumer) {/*{{{*/
$token_field = @$req->get_parameter('oauth_token'); $token_field = @$req->get_parameter('oauth_token');
$token = $datastore->lookup_token($consumer, 'request', $token_field); $token = $datastore->lookup_token($consumer, 'request', $token_field);
if (!$token) { if (!$token) {