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

Fixes issue with HTML entities

Browse source
This commit is contained in:
Andris Reinman 2017-03-19 13:39:34 +02:00
parent d2b0a611d7
commit 9d5fb816c9
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/tools.js
View file

@ -6,6 +6,7 @@ let Isemail = require('isemail');
let urllib = require('url');
let juice = require('juice');
let jsdom = require('jsdom');
let he = require('he');
let _ = require('./translate')._;
let util = require('util');
@ -169,7 +170,7 @@ function getMessageLinks(serviceUrl, campaign, list, subscription) {
};
}
function formatMessage(serviceUrl, campaign, list, subscription, message, filter) {
function formatMessage(serviceUrl, campaign, list, subscription, message, filter, isHTML) {
filter = typeof filter === 'function' ? filter : (str => str);
let links = getMessageLinks(serviceUrl, campaign, list, subscription);
@ -180,7 +181,9 @@ function formatMessage(serviceUrl, campaign, list, subscription, message, filter
return links[key];
}
if (subscription.mergeTags.hasOwnProperty(key)) {
return subscription.mergeTags[key];
return isHTML ? he.encode(subscription.mergeTags[key], {
useNamedReferences: true
}) : subscription.mergeTags[key];
}
return false;
};