IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 11:48:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2439 from peternlewis/mailing_list_mode_disables_private_message_emails2

Browse Source 
Bugfix: Mailing list mode disables PM emails (take 2)
This commit is contained in:
Robin Ward 2014-06-13 14:46:38 -04:00
commit 4a2d6bd5da
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/user_notifications.rb
View File

@ -153,7 +153,7 @@ class UserNotifications < ActionMailer::Base
username = @notification.data_hash[:original_username] username = @notification.data_hash[:original_username]
notification_type = opts[:notification_type] || Notification.types[@notification.notification_type].to_s notification_type = opts[:notification_type] || Notification.types[@notification.notification_type].to_s
return if user.mailing_list_mode && return if user.mailing_list_mode && !@post.topic.private_message? &&
["replied", "mentioned", "quoted", "posted"].include?(notification_type) ["replied", "mentioned", "quoted", "posted"].include?(notification_type)
title = @notification.data_hash[:topic_title] title = @notification.data_hash[:topic_title]