Skip to content

Commit

Permalink
Change from address
Browse files Browse the repository at this point in the history
closes TryGhost#872
- changed from address to use config.mail.fromaddress
- changed from address to default to settings.email
  • Loading branch information
sebgie authored and ErisDS committed Oct 11, 2013
1 parent a37d487 commit b040ea3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/server/mail.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down

0 comments on commit b040ea3

Please sign in to comment.