Revert "Bugfix: Mailing list mode disables PM emails"
This reverts commit 6a2dde6417
.
This commit is contained in:
parent
1542854a93
commit
92d2912ff2
|
@ -100,8 +100,7 @@ class UserNotifications < ActionMailer::Base
|
||||||
opts[:allow_reply_by_email] = true
|
opts[:allow_reply_by_email] = true
|
||||||
|
|
||||||
# We use the 'user_posted' event when you are emailed a post in a PM.
|
# 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] = 'posted'
|
||||||
opts[:notification_type] = 'postedprivate'
|
|
||||||
|
|
||||||
notification_email(user, opts)
|
notification_email(user, opts)
|
||||||
end
|
end
|
||||||
|
@ -157,12 +156,6 @@ class UserNotifications < ActionMailer::Base
|
||||||
return if user.mailing_list_mode && !@post.topic.private_message? &&
|
return if user.mailing_list_mode && !@post.topic.private_message? &&
|
||||||
["replied", "mentioned", "quoted", "posted"].include?(notification_type)
|
["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]
|
title = @notification.data_hash[:topic_title]
|
||||||
allow_reply_by_email = opts[:allow_reply_by_email] unless user.suspended?
|
allow_reply_by_email = opts[:allow_reply_by_email] unless user.suspended?
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue