From: Tom Hughes <tom@compton.nu>
Date: Tue, 14 Aug 2007 23:38:52 +0000 (+0000)
Subject: Fix exception when username is not known.
X-Git-Tag: live~8196
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4fd689b03551a5d03cd7843504e277fc7078ad1a

Fix exception when username is not known.
---

diff --git a/app/models/user.rb b/app/models/user.rb
index ec4c2f788..3fdebbf61 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -33,7 +33,7 @@ class User < ActiveRecord::Base
   def self.authenticate(options)
     if options[:username] and options[:password]
       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]
       token = UserToken.find(:first, :include => :user, :conditions => ["user_tokens.token = ?", options[:token]])
       user = token.user if token