OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix email sending fail when blog title has a comma

Browse Source 
no issue

- We send emails from Blog Title <ghost@blog-url.com>, but it should be from "Blog Title" <ghost@blog-url.com>
- It worked fine without quotes unless you have a comma in your Blog Title in which case different mail systems get confused in different ways
This commit is contained in:
Hannah Wolfe 2015-01-09 21:03:03 +00:00
parent 7501b4478d
commit 283deb2461
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/server/mail.js
View File

@ -43,7 +43,7 @@ GhostMailer.prototype.from = function () {
if (!config.theme.title) {
config.theme.title = 'Ghost at ' + this.getDomain();
}
from = config.theme.title + ' <' + from + '>';
from = '"' + config.theme.title + '" <' + from + '>';
}
return from;

32
core/test/unit/mail_spec.js
View File

@ -71,57 +71,57 @@ describe('Mail', function () {
it('should use from address as configured in config.js', function () {
config.set({
mail: {
from: 'Blog Title <static@example.com>'
from: '"Blog Title" <static@example.com>'
}
});
mailer.from().should.equal('Blog Title <static@example.com>');
mailer.from().should.equal('"Blog Title" <static@example.com>');
});
it('should fall back to [blog.title] <ghost@[blog.url]> as from address', function () {
// Standard domain
config.set({url: 'http://default.com', mail: {from: null}, theme: {title: 'Test'}});
mailer.from().should.equal('Test <ghost@default.com>');
mailer.from().should.equal('"Test" <ghost@default.com>');
// Trailing slash
config.set({url: 'http://default.com/', mail: {from: null}, theme: {title: 'Test'}});
mailer.from().should.equal('Test <ghost@default.com>');
mailer.from().should.equal('"Test" <ghost@default.com>');
// Strip Port
config.set({url: 'http://default.com:2368/', mail: {from: null}, theme: {title: 'Test'}});
mailer.from().should.equal('Test <ghost@default.com>');
mailer.from().should.equal('"Test" <ghost@default.com>');
});
it('should use mail.from if both from and fromaddress are present', function () {
// Standard domain
config.set({mail: {from: 'bar <from@default.com>', fromaddress: 'Qux <fa@default.com>'}});
mailer.from().should.equal('bar <from@default.com>');
config.set({mail: {from: '"bar" <from@default.com>', fromaddress: '"Qux" <fa@default.com>'}});
mailer.from().should.equal('"bar" <from@default.com>');
});
it('should attach blog title if from or fromaddress are only email addresses', function () {
// from and fromaddress are both set
config.set({mail: {from: 'from@default.com', fromaddress: 'fa@default.com'}, theme: {title: 'Test'}});
mailer.from().should.equal('Test <from@default.com>');
mailer.from().should.equal('"Test" <from@default.com>');
// only from set
config.set({mail: {from: 'from@default.com', fromaddress: null}, theme: {title: 'Test'}});
mailer.from().should.equal('Test <from@default.com>');
mailer.from().should.equal('"Test" <from@default.com>');
// only fromaddress set
config.set({mail: {from: null, fromaddress: 'fa@default.com'}, theme: {title: 'Test'}});
mailer.from().should.equal('Test <fa@default.com>');
mailer.from().should.equal('"Test" <fa@default.com>');
});
it('should ignore theme title if from address is Title <email@address.com> format', function () {
// from and fromaddress are both set
config.set({mail: {from: 'R2D2 <from@default.com>', fromaddress: 'C3PO <fa@default.com>'}, theme: {title: 'Test'}});
mailer.from().should.equal('R2D2 <from@default.com>');
config.set({mail: {from: '"R2D2" <from@default.com>', fromaddress: '"C3PO" <fa@default.com>'}, theme: {title: 'Test'}});
mailer.from().should.equal('"R2D2" <from@default.com>');
// only from set
config.set({mail: {from: 'R2D2 <from@default.com>', fromaddress: null}, theme: {title: 'Test'}});
mailer.from().should.equal('R2D2 <from@default.com>');
config.set({mail: {from: '"R2D2" <from@default.com>', fromaddress: null}, theme: {title: 'Test'}});
mailer.from().should.equal('"R2D2" <from@default.com>');
// only fromaddress set
config.set({mail: {from: null, fromaddress: 'C3PO <fa@default.com>'}, theme: {title: 'Test'}});
mailer.from().should.equal('C3PO <fa@default.com>');
config.set({mail: {from: null, fromaddress: '"C3PO" <fa@default.com>'}, theme: {title: 'Test'}});
mailer.from().should.equal('"C3PO" <fa@default.com>');
});
});