Merge branch 'oauth_rails3' into stable

Victor Costa
2 parents 0eaa0ca7 c7741f56
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
plugins/oauth_provider/controllers/public/oauth_provider_plugin_public_controller.rb
@@ -3,7 +3,7 @@ class OauthProviderPluginPublicController &lt; PublicController
   doorkeeper_for :me
  
   def me
-    user = User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
+    user = environment.users.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
     render :json => {:id =>user.login, :email => user.email}.to_json
   end
...	...	@@ -3,7 +3,7 @@ class OauthProviderPluginPublicController < PublicController
3	3	doorkeeper_for :me
4	4
5	5	def me
6		- user = User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
	6	+ user = environment.users.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
7	7	render :json => {:id =>user.login, :email => user.email}.to_json
8	8	end
9	9
...	...