Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3172 from techAPJ/patch-1 

FIX: check for full name in invite email subject
This commit is contained in:
Régis Hanol 2015-02-05 18:32:17 +01:00
parent 521d3de10d c90251ea25
commit d0b83c6fb2
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/invite_mailer.rb
View File

@ -9,7 +9,7 @@ class InviteMailer < ActionMailer::Base
# get invitee name (based on site setting) # get invitee name (based on site setting)
invitee_name = invite.invited_by.username invitee_name = invite.invited_by.username
if (SiteSetting.enable_names) if SiteSetting.enable_names && invite.invited_by.name.present?
invitee_name = "#{invite.invited_by.name} (#{invite.invited_by.username})" invitee_name = "#{invite.invited_by.name} (#{invite.invited_by.username})"
end end