From 45e8337a2909df41daa0a83d00fac494d10d9d5e Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 11 Sep 2014 15:53:29 +1000
Subject: [PATCH] FEATURE: renames forgot_password_verbose,
forgot_password_strict
---
app/controllers/session_controller.rb | 2 +-
config/locales/server.en.yml | 2 +-
config/site_settings.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 2a291716a..6f016931b 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -110,7 +110,7 @@ class SessionController < ApplicationController
end
json = { result: "ok" }
- if SiteSetting.forgot_password_verbose
+ unless SiteSetting.forgot_password_strict
json[:user_found] = user.present?
end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 2cfe9ac4e..823d86484 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -749,7 +749,7 @@ en:
allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines."
email_domains_blacklist: "A list of email domains that users are not allowed to register accounts with. Example: mailinator.com trashmail.net"
email_domains_whitelist: "A list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!"
- forgot_password_verbose: "Inform users of an account's existance when they use the forgot password dialog."
+ forgot_password_strict: "Don't inform users of an account's existance when they use the forgot password dialog."
version_checks: "Ping the Discourse Hub for version updates and show new version messages on the /admin dashboard"
new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index e12a48081..072b25994 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -239,7 +239,7 @@ login:
email_domains_whitelist:
default: ''
type: list
- forgot_password_verbose: true
+ forgot_password_strict: false
users:
min_username_length: