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

FIX: Topic and Post may be nil.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-02-24 14:30:28 +08:00
parent b500f35d14
commit f89e9024ba
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/jobs/regular/user_email.rb
View File

@@ -50,7 +50,7 @@ module Jobs
NOTIFICATIONS_SENT_BY_MAILING_LIST ||= Set.new %w{posted replied mentioned group_mentioned quoted}
def message_for_email(user, post, type, notification,
def message_for_email(user, post, type, notification,
notification_type=nil, notification_data_hash=nil,
email_token=nil, to_address=nil)
@@ -86,7 +86,7 @@ module Jobs
end
if user.user_option.mailing_list_mode? &&
!post.topic.private_message? &&
(!post.try(:topic).try(:private_message?)) &&
NOTIFICATIONS_SENT_BY_MAILING_LIST.include?(email_args[:notification_type])
# no need to log a reason when the mail was already sent via the mailing list job
return [nil, nil]