Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2998 from techAPJ/patch-1 

FIX: cleanup commas in email From and Reply-to fields
This commit is contained in:
Régis Hanol 2014-11-24 15:50:24 +01:00
parent 7611eb4e78 20044da474
commit 58e9349206
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/email.rb
View File

@ -23,7 +23,7 @@ module Email
def self.cleanup_alias(name) def self.cleanup_alias(name)
# TODO: I'm sure there are more, but I can't find a list # TODO: I'm sure there are more, but I can't find a list
name ? name.gsub(/[:<>]/, '') : name name ? name.gsub(/[:<>,]/, '') : name
end end
end end

6
spec/components/email/message_builder_spec.rb
View File

@ -58,7 +58,7 @@ describe Email::MessageBuilder do
end end
it "cleans up the site title" do it "cleans up the site title" do
SiteSetting.stubs(:title).returns(">>>Obnoxious Title: Deal With It<<<") SiteSetting.stubs(:title).returns(">>>Obnoxious Title: Deal, With It<<<")
expect(reply_by_email_builder.header_args['Reply-To']).to eq("Obnoxious Title Deal With It <r+#{reply_key}@reply.myforum.com>") expect(reply_by_email_builder.header_args['Reply-To']).to eq("Obnoxious Title Deal With It <r+#{reply_key}@reply.myforum.com>")
end end
end end
@ -253,12 +253,12 @@ describe Email::MessageBuilder do
end end
it "cleans up aliases in the from_alias arg" do it "cleans up aliases in the from_alias arg" do
builder = Email::MessageBuilder.new(to_address, from_alias: "Finn: the Dog <3", from: finn_email) builder = Email::MessageBuilder.new(to_address, from_alias: "Finn: the Dog, <3", from: finn_email)
builder.build_args[:from].should == "Finn the Dog 3 <#{finn_email}>" builder.build_args[:from].should == "Finn the Dog 3 <#{finn_email}>"
end end
it "cleans up the email_site_title" do it "cleans up the email_site_title" do
SiteSetting.stubs(:email_site_title).returns("::>>>Best Forum EU: Award Winning<<<") SiteSetting.stubs(:email_site_title).returns("::>>>Best Forum, EU: Award Winning<<<")
expect(build_args[:from]).to eq("Best Forum EU Award Winning <#{SiteSetting.notification_email}>") expect(build_args[:from]).to eq("Best Forum EU Award Winning <#{SiteSetting.notification_email}>")
end end