IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3922 from featheredtoast/username-email-from-field

Browse Source 
username as from in emails
This commit is contained in:
Sam
2015-12-15 21:23:53 +11:00
parent f97a754b30 bffdc5907a
commit 2230879a24
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/mailers/user_notifications.rb
View File

@@ -156,7 +156,9 @@ class UserNotifications < ActionMailer::Base
title: post.topic.title,
post: post,
username: post.user.username,
from_alias: (SiteSetting.enable_names && SiteSetting.display_name_on_posts && post.user.name.present?) ? post.user.name : post.user.username,
from_alias: (SiteSetting.enable_names &&
SiteSetting.display_name_on_email_from &&
post.user.name.present?) ? post.user.name : post.user.username,
allow_reply_by_email: true,
use_site_subject: true,
add_re_to_subject: true,
@@ -202,7 +204,8 @@ class UserNotifications < ActionMailer::Base
return unless @post = opts[:post]
user_name = @notification.data_hash[:original_username]
if @post && SiteSetting.enable_names && SiteSetting.display_name_on_posts
if @post && SiteSetting.enable_names && SiteSetting.display_name_on_email_from
name = User.where(id: @post.user_id).pluck(:name).first
user_name = name unless name.blank?
end