TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 03:44:29 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2137 from jgillich/patch-1

Browse Source 
Don't require mail.options to be set
This commit is contained in:
Hannah Wolfe 2014-02-08 15:22:50 +00:00
commit 1783a895de
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/server/mail.js
View File

@ -16,7 +16,7 @@ function GhostMailer(opts) {
// *This promise should always resolve to avoid halting Ghost::init*. // *This promise should always resolve to avoid halting Ghost::init*.
GhostMailer.prototype.init = function () { GhostMailer.prototype.init = function () {
var self = this; var self = this;
if (config().mail && config().mail.transport && config().mail.options) { if (config().mail && config().mail.transport) {
this.createTransport(); this.createTransport();
return when.resolve(); return when.resolve();
} }
@ -53,7 +53,7 @@ GhostMailer.prototype.detectSendmail = function () {
}; };
GhostMailer.prototype.createTransport = function () { GhostMailer.prototype.createTransport = function () {
this.transport = nodemailer.createTransport(config().mail.transport, _.clone(config().mail.options)); this.transport = nodemailer.createTransport(config().mail.transport, _.clone(config().mail.options) || {});
}; };
GhostMailer.prototype.usingSendmail = function () { GhostMailer.prototype.usingSendmail = function () {