cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix exception when username is not known.

Browse source
This commit is contained in:
Tom Hughes 2007-08-14 23:38:52 +00:00
parent c2b377efac
commit 4fd689b035
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -33,7 +33,7 @@ class User < ActiveRecord::Base
def self.authenticate(options) def self.authenticate(options)
if options[:username] and options[:password] if options[:username] and options[:password]
user = find(:first, :conditions => ["email = ? OR display_name = ?", options[:username], options[:username]]) user = find(:first, :conditions => ["email = ? OR display_name = ?", options[:username], options[:username]])
user = nil unless user.pass_crypt == OSM::encrypt_password(options[:password], user.pass_salt) user = nil if user and user.pass_crypt != OSM::encrypt_password(options[:password], user.pass_salt)
elsif options[:token] elsif options[:token]
token = UserToken.find(:first, :include => :user, :conditions => ["user_tokens.token = ?", options[:token]]) token = UserToken.find(:first, :include => :user, :conditions => ["user_tokens.token = ?", options[:token]])
user = token.user if token user = token.user if token