correct order of params in get_token

darcs-hash:20080605025152-84dde-54da3eba220432b71d14ef7cfd4a8a7bf664316f.gz

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