Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

Merge pull request #1000 from sebgie/issue#872

Browse source
This commit is contained in:
Hannah Wolfe 2013-10-11 13:18:59 +01:00
commit 6db7e6d96e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/server/mail.js
View file

@ -95,7 +95,7 @@ GhostMailer.prototype.send = function (message) {
return when.reject(new Error('Email Error: Incomplete message data.'));
}
var from = 'ghost-mailer@' + url.parse(this.ghost.config().url).hostname,
var from = this.ghost.config().mail.fromaddress || this.ghost.settings('email'),
to = message.to || this.ghost.settings('email'),
sendMail = nodefn.lift(this.transport.sendMail.bind(this.transport));