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

FIX: 'reply by email addresses' site settings should allow email addresses without a 'reply_key' when 'find related post with key' is disabled

Browse Source
This commit is contained in:
Régis Hanol
2018-03-02 17:53:18 +01:00
parent 334ed74346
commit 6a78669ca3
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/validators/reply_by_email_address_validator.rb
View File

@ -4,11 +4,14 @@ class ReplyByEmailAddressValidator
end
def valid_value?(val)
return true if val.blank?
return true if val.blank?
return false if val["@"].nil?
!!val["@"] &&
!!val["%{reply_key}"] &&
val.gsub(/\+?%{reply_key}/, "") != SiteSetting.notification_email
if SiteSetting.find_related_post_with_key
!!val["%{reply_key}"] && val.sub(/\+?%{reply_key}/, "") != SiteSetting.notification_email
else
val != SiteSetting.notification_email
end
end
def error_message