Merge 16743:16811 from trunk.

[rails.git] / vendor / plugins / oauth-plugin / lib / oauth / rails / controller_methods.rb

diff --git a/vendor/plugins/oauth-plugin/lib/oauth/rails/controller_methods.rb b/vendor/plugins/oauth-plugin/lib/oauth/rails/controller_methods.rb
index 668328b7e79fad807610e55f086313c5822fb977..68ef9d224738ecb9420247525865e9bc67a94625 100644 (file)
--- a/vendor/plugins/oauth-plugin/lib/oauth/rails/controller_methods.rb
+++ b/vendor/plugins/oauth-plugin/lib/oauth/rails/controller_methods.rb
@@ -96,7 +96,7 @@ module OAuth
       def verify_oauth_signature
         begin
           valid = ClientApplication.verify_request(request) do |request|
       def verify_oauth_signature
         begin
           valid = ClientApplication.verify_request(request) do |request|

-            self.current_token = ClientApplication.find_token(request.token)
+            self.current_token = OauthToken.find_token(request.token)

             logger.info "self=#{self.class.to_s}"
             logger.info "token=#{self.current_token}"
             # return the token secret and the consumer secret
             logger.info "self=#{self.class.to_s}"
             logger.info "token=#{self.current_token}"
             # return the token secret and the consumer secret


@@ -111,4 +111,4 @@ module OAuth
       end
     end
   end
       end
     end
   end

-end
\ No newline at end of file
+end