From 92d2912ff2cc78737c46036801987b7179b697e9 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Mon, 16 Jun 2014 16:36:02 +1000 Subject: [PATCH] Revert "Bugfix: Mailing list mode disables PM emails" This reverts commit 6a2dde641716209e89fa7cff75c159255abdf4bd. --- app/mailers/user_notifications.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index c42750b0e89..56802bb3088 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -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?