From b040ea3365cebc03b2f826d309278b3c6362f527 Mon Sep 17 00:00:00 2001 From: Sebastian Gierlinger Date: Fri, 11 Oct 2013 11:47:41 +0200 Subject: [PATCH] Change from address closes #872 - changed from address to use config.mail.fromaddress - changed from address to default to settings.email --- core/server/mail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/server/mail.js b/core/server/mail.js index 990bc0608d..a944b22390 100644 --- a/core/server/mail.js +++ b/core/server/mail.js @@ -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));