meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-05 07:01:30 +00:00
Code Issues Releases Wiki Activity

Code cleanup: use safe navigation operator in app/models/mailer.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@18045 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2019-04-06 06:17:03 +00:00
parent bc9de070df
commit 25ec4a9366
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/mailer.rb
View File

@ -632,7 +632,7 @@ class Mailer < ActionMailer::Base
mail_from = Mail::Address.new(Setting.mail_from)
if mail_from.display_name.blank? && mail_from.comments.blank?
mail_from.display_name =
(@author && @author.logged?) ? @author.name : Setting.app_title
@author&.logged? ? @author.name : Setting.app_title
end
headers.reverse_merge! 'X-Mailer' => 'Redmine',
@ -653,13 +653,13 @@ class Mailer < ActionMailer::Base
# Removes the author from the recipients and cc
# if the author does not want to receive notifications
# about what the author do
if @author && @author.logged? && @author.pref.no_self_notified
if @author&.logged? && @author.pref.no_self_notified
addresses = @author.mails
headers[:to] -= addresses if headers[:to].is_a?(Array)
headers[:cc] -= addresses if headers[:cc].is_a?(Array)
end
if @author && @author.logged?
if @author&.logged?
redmine_headers 'Sender' => @author.login
end