IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

rename forgot_password_strict to hide_email_address_taken

Browse Source
This commit is contained in:
Neil Lalonde
2017-10-03 15:28:15 -04:00
parent e47f5cedd2
commit 1faae3c765
24 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/session_controller.rb
View File

@@ -247,7 +247,7 @@ class SessionController < ApplicationController
end
json = { result: "ok" }
unless SiteSetting.forgot_password_strict
unless SiteSetting.hide_email_address_taken
json[:user_found] = user_presence
end

2
app/controllers/users_controller.rb
View File

@@ -372,7 +372,7 @@ class UsersController < ApplicationController
message: activation.message,
user_id: user.id
}
elsif SiteSetting.forgot_password_strict && user.errors[:primary_email]&.include?(I18n.t('errors.messages.taken'))
elsif SiteSetting.hide_email_address_taken && user.errors[:primary_email]&.include?(I18n.t('errors.messages.taken'))
session["user_created_message"] = activation.success_message
if existing_user = User.find_by_email(user.primary_email&.email)