X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e3ae690a006f4bf23eaedcd9817d0750ceeebc55..77a34278ca697ac47ce451959d7f8c2774d5188a:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 5a277c9b4..4113662aa 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -42,13 +42,7 @@ class User < ActiveRecord::Base
 
   def self.authenticate(options)
     if options[:username] and options[:password]
-      environment = Rails.configuration.environment
-      adapter = Rails.configuration.database_configuration[environment]["adapter"]
-      if adapter == "postgresql"
-        user = find(:first, :conditions => ["email ILIKE ? OR display_name ILIKE ?", options[:username], options[:username]])
-      else
-        user = find(:first, :conditions => ["email = ? OR display_name = ?", options[:username], options[:username]])
-      end
+      user = find(:first, :conditions => ["email = ? OR display_name = ?", options[:username], options[:username]])
       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]])