github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: new 'manual_polling_enabled' site setting

Browse Source
This commit is contained in:
Régis Hanol
2016-03-16 22:28:01 +01:00
parent 84d234a98a
commit 20ce7f29e0
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/validators/reply_by_email_enabled_validator.rb
View File

@ -9,14 +9,14 @@ class ReplyByEmailEnabledValidator
return true if val == "f"
# ensure reply_by_email_address is configured && polling is working
SiteSetting.reply_by_email_address.present? &&
SiteSetting.pop3_polling_enabled?
SiteSetting.email_polling_enabled?
end
def error_message
if SiteSetting.reply_by_email_address.blank?
I18n.t("site_settings.errors.reply_by_email_address_is_empty")
else
I18n.t("site_settings.errors.pop3_polling_disabled")
I18n.t("site_settings.errors.email_polling_disabled")
end
end