Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-07-04 13:58:53 +02:00
Code Issues Packages Projects Releases Activity

Merged r13126 (#16619).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13155 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2014-05-24 16:29:46 +00:00
parent 23b322772d
commit fb0c262f8f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/mailer.rb
View File

@@ -464,7 +464,7 @@ class Mailer < ActionMailer::Base
if rand
hash << Redmine::Utils.random_hex(8)
end
host = Setting.mail_from.to_s.gsub(%r{^.*@}, '')
host = Setting.mail_from.to_s.strip.gsub(%r{^.*@|>}, '')
host = "#{::Socket.gethostname}.redmine" if host.empty?
"#{hash.join('.')}@#{host}"
end

6
test/unit/mailer_test.rb
View File

@@ -650,6 +650,12 @@ class MailerTest < ActiveSupport::TestCase
assert ActionMailer::Base.perform_deliveries
end
def test_token_for_should_strip_trailing_gt_from_address_with_full_name
with_settings :mail_from => "Redmine Mailer<no-reply@redmine.org>" do
assert_match /\Aredmine.issue-\d+\.\d+\.[0-9a-f]+@redmine.org\z/, Mailer.token_for(Issue.generate!)
end
end
def test_layout_should_include_the_emails_header
with_settings :emails_header => "*Header content*" do
with_settings :plain_text_mail => 0 do