@@ -59,7 +59,12 @@ class User < ActiveRecord::Base # Authenticates a user by their login name and unencrypted password. Returns the user or nil. def self.authenticate(login, password) - u = find_in_state :first, :active, :conditions => {:login => login} # need to get the salt + if Tog::Config["plugins.tog_user.email_as_login"] + login_column = :email + else + login_column = :login + end + u = find_in_state :first, :active, :conditions => { login_column => login} # need to get the salt u && u.authenticated?(password) ? u : nil end app/models/user.rb dd1cc4b209d9a868c92f81444f60f2b952ab2023 Gaizka Villate gaizkav@gmail.com http://github.com/tog/tog_user/commit/f87e637a4eb390038e765d8d6eec3ab330d1ba73 f87e637a4eb390038e765d8d6eec3ab330d1ba73 2009-06-10T15:47:11-07:00 2009-06-09T14:52:19-07:00 Fix User.authenticate when Tog::Config["plugins.tog_user.email_as_login"] is set Signed-off-by: tog - extensible open source social network platform <tog@linkingpaths.com> 27cf5e96489bd67cdf5690ffa3f03c0d64ea1f6b tog - extensible open source social network platform tog@linkingpaths.com