ropiku · February 11, 2009 23:33
diff --git a/user.rb b/user.rb
  def self.authenticate(email, password)
    user = find(:first, :conditions => ['username = ? OR email = ?', email.to_s.downcase, email.to_s.downcase])
    user && user.authenticated?(password) ? user : nil
  end
	def self.authenticate(email, password)
	user = find(:first, :conditions => ['username = ? OR email = ?', email.to_s.downcase, email.to_s.downcase])
	user && user.authenticated?(password) ? user : nil
	end