IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 03:10:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Bugfix: Mailing list mode disables PM emails"

Browse Source 
This reverts commit 6a2dde6417.
This commit is contained in:
Sam Saffron 2014-06-16 16:36:02 +10:00
parent 1542854a93
commit 92d2912ff2
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/mailers/user_notifications.rb
View File

@ -100,8 +100,7 @@ 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.
# but it must get through to email in mailing list mode
opts[:notification_type] = 'postedprivate'
opts[:notification_type] = 'posted'
notification_email(user, opts)
end
@ -157,12 +156,6 @@ class UserNotifications < ActionMailer::Base
return if user.mailing_list_mode && !@post.topic.private_message? &&
["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?