github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 08:15:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Bugfix: Mailing list mode disables PM emails

Browse Source 
Emailing a PM uses the user_posted event/format, but Mailing List Mode disables emails with this format.

We work around this by temporarily using "postedprivate", and then reverting back to "posted" efter the Mailing List Mode check.
This commit is contained in:
Peter N Lewis 2014-06-06 15:04:33 +08:00
parent 72130357ed
commit 6a2dde6417
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/mailers/user_notifications.rb
View File

@ -100,7 +100,8 @@ class UserNotifications < ActionMailer::Base
opts[:allow_reply_by_email] = true
# We use the 'user_posted' event when you are emailed a post in a PM.
opts[:notification_type] = 'posted'
# but it must get through to email in mailing list mode
opts[:notification_type] = 'postedprivate'
notification_email(user, opts)
end
@ -156,6 +157,12 @@ class UserNotifications < ActionMailer::Base
return if user.mailing_list_mode &&
["replied", "mentioned", "quoted", "posted"].include?(notification_type)
# We use the 'user_posted' event when you are emailed a post in a PM.
# but it must get through to email in mailing list mode
if notification_type == 'postedprivate'
notification_type = 'posted'
end
title = @notification.data_hash[:topic_title]
allow_reply_by_email = opts[:allow_reply_by_email] unless user.suspended?