meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-22 08:21:14 +00:00
Code Issues Releases Wiki Activity

Don't overwrite headers that were already set (#14699).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13784 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2014-12-21 19:46:33 +00:00
parent 7296b569a3
commit a3d4b63261
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/models/mailer.rb
View File

@ -370,7 +370,7 @@ class Mailer < ActionMailer::Base
end end
def mail(headers={}, &block) def mail(headers={}, &block)
headers.merge! 'X-Mailer' => 'Redmine', headers.reverse_merge! 'X-Mailer' => 'Redmine',
'X-Redmine-Host' => Setting.host_name, 'X-Redmine-Host' => Setting.host_name,
'X-Redmine-Site' => Setting.app_title, 'X-Redmine-Site' => Setting.app_title,
'X-Auto-Response-Suppress' => 'OOF', 'X-Auto-Response-Suppress' => 'OOF',