public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed thrown errors

Browse source
This commit is contained in:
Andris Reinman 2017-03-21 10:39:44 +02:00
parent 73ee6bf4a1
commit 179e0d5ab3
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/tools.js
View file

@ -186,7 +186,7 @@ function formatMessage(serviceUrl, campaign, list, subscription, message, filter
return links[key];
}
if (subscription.mergeTags.hasOwnProperty(key)) {
return isHTML ? he.encode(subscription.mergeTags[key], {
return isHTML ? he.encode((subscription.mergeTags[key] || ''), {
useNamedReferences: true
}) : subscription.mergeTags[key];
}
@ -295,4 +295,4 @@ function mergeTemplateIntoLayout(template, layout, callback) {
} else {
return done(template, layout);
}
}
}

4
services/sender.js
View file

@ -414,10 +414,6 @@ function formatMessage(message, callback) {
'List-ID': {
prepared: true,
value: libmime.encodeWords(list.name) + ' <' + list.cid + '.' + (url.parse(configItems.serviceUrl).hostname || 'localhost') + '>'
},
'List-Unsubscribe': {
prepared: true,
value: url.resolve(configItems.serviceUrl, '/subscription/' + list.cid + '/unsubscribe/' + message.subscription.cid + '?auto=yes')
}
},
list: {