TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-01 13:54:35 +03:00
Code Issues Projects Releases Wiki Activity

Fix unhandled exception

Browse Source 
no ref
- return result of mail.send
This commit is contained in:
Fabian Becker 2014-07-30 17:29:49 +00:00
parent 99cc855f55
commit 29ad30bec8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/server/api/authentication.js
View File

@ -51,7 +51,9 @@ authentication = {
resetUrl: resetUrl
};
mail.generateContent({data: emailData, template: 'reset-password'}).then(function (emailContent) {
return emailData;
}).then(function (emailData) {
return mail.generateContent({data: emailData, template: 'reset-password'}).then(function (emailContent) {
var payload = {
mail: [{
message: {
@ -65,7 +67,6 @@ authentication = {
};
return mail.send(payload, {context: {internal: true}});
});
}).then(function () {
return when.resolve({passwordreset: [{message: 'Check your email for further instructions.'}]});
}).otherwise(function (error) {
@ -218,7 +219,7 @@ authentication = {
ownerEmail: setupUser.email
};
mail.generateContent({data: data, template: 'welcome'}).then(function (emailContent) {
return mail.generateContent({data: data, template: 'welcome'}).then(function (emailContent) {
var message = {
to: setupUser.email,
subject: 'Your New Ghost Blog',
@ -231,6 +232,9 @@ authentication = {
options: {}
}]
};
return payload;
}).then(function (payload) {
return mail.send(payload, {context: {internal: true}}).otherwise(function (error) {
errors.logError(
error.message,