From 6a2dde641716209e89fa7cff75c159255abdf4bd Mon Sep 17 00:00:00 2001 From: Peter N Lewis Date: Fri, 6 Jun 2014 15:04:33 +0800 Subject: [PATCH] Bugfix: Mailing list mode disables PM emails 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. --- app/mailers/user_notifications.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index 5981e87969..d92af6fec1 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -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?