X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9d106676b8b122b5458360c28e9ab14363d11aea..e17b89e89fa932673f7dc2cf5a2fd3437ec0eda6:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 3ff9277f0..2cdb94046 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -83,7 +83,7 @@ class User < ActiveRecord::Base user = nil end elsif options[:token] - token = UserToken.find_by_token(options[:token]) + token = UserToken.find_by(:token => options[:token]) user = token.user if token end @@ -240,7 +240,7 @@ class User < ActiveRecord::Base ## # return an oauth access token for a specified application def access_token(application_key) - ClientApplication.find_by_key(application_key).access_token_for_user(self) + ClientApplication.find_by(:key => application_key).access_token_for_user(self) end private