github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 15:28:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

better consistency around email case sensitivity

Browse Source
This commit is contained in:
Régis Hanol
2013-04-15 02:20:33 +02:00
parent c6ab9fec9d
commit b24c1a1ad9
10 changed files with 62 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user.rb
View File

@ -193,7 +193,9 @@ class User < ActiveRecord::Base
end
def self.find_by_username_or_email(username_or_email)
where("username_lower = :user or lower(username) = :user or lower(email) = :user or lower(name) = :user", user: username_or_email.downcase)
lower_user = username_or_email.downcase
lower_email = Email.downcase(username_or_email)
where("username_lower = :user or lower(username) = :user or email = :email or lower(name) = :user", user: lower_user, email: lower_email)
end
# tricky, we need our bus to be subscribed from the right spot