Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

Remove use of email_in_address and email_in_category

Browse source
This commit is contained in:
riking 2014-07-11 13:30:08 -07:00
parent 3df3a908ac
commit 17db265b41
4 changed files with 6 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/email/receiver.rb
View file

@ -44,7 +44,7 @@ module Email
end
raise UserNotFoundError if @user.blank?
raise UserNotSufficientTrustLevelError.new @user unless @user.has_trust_level?(TrustLevel.levels[SiteSetting.email_in_min_trust.to_i])
raise UserNotSufficientTrustLevelError.new @user unless @allow_strangers || @user.has_trust_level?(TrustLevel.levels[SiteSetting.email_in_min_trust.to_i])
create_new_topic
else
@ -134,11 +134,7 @@ module Email
def is_in_email?
@allow_strangers = false
if SiteSetting.email_in && SiteSetting.email_in_address == @message.to.first
@category_id = SiteSetting.email_in_category.to_i
return true
end
return false unless SiteSetting.email_in
category = Category.find_by_email(@message.to.first)
return false unless category