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
commit d0b83c6fb2

View file

@ -9,7 +9,7 @@ class InviteMailer < ActionMailer::Base
# get invitee name (based on site setting)
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})"
end