diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-21 19:46:33 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-21 19:46:33 +0000 |
| commit | a3d4b63261c2e54ace2a0de6cda67cba704bf5d9 (patch) | |
| tree | 24324840ebc1dac331124dcfecd974efb939080c /app | |
| parent | 7296b569a3de2143d634f731b2ce1f18fbf08b0a (diff) | |
| download | redmine-a3d4b63261c2e54ace2a0de6cda67cba704bf5d9.tar.gz redmine-a3d4b63261c2e54ace2a0de6cda67cba704bf5d9.zip | |
Don't overwrite headers that were already set (#14699).
git-svn-id: http://svn.redmine.org/redmine/trunk@13784 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/mailer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 8be6f83fd..f59dadc57 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -370,7 +370,7 @@ class Mailer < ActionMailer::Base end def mail(headers={}, &block) - headers.merge! 'X-Mailer' => 'Redmine', + headers.reverse_merge! 'X-Mailer' => 'Redmine', 'X-Redmine-Host' => Setting.host_name, 'X-Redmine-Site' => Setting.app_title, 'X-Auto-Response-Suppress' => 'OOF', |