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

Update 'server/lib/tools.js'

Browse source
This commit is contained in:
dark 2020-09-17 10:11:41 +00:00
parent 87dc416f48
commit 0e580cac12
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/lib/tools.js
View file

@ -170,11 +170,11 @@ function _formatTemplateSimple(source, mergeTags, isHTML) {
return '';
}
const containsHTML = /<[a-z][\s\S]*>/.test(value);
return isHTML ? (containsHTML ? value : value.replace(/(?:\r\n|\r|\n)/g, '<br/>'), {
useNamedReferences: true,
allowUnsafeSymbols: true
}) : (containsHTML ? htmlToText.fromString(value) : value);
// const containsHTML = /<[a-z][\s\S]*>/.test(value);
// return isHTML ? (containsHTML ? value : value.replace(/(?:\r\n|\r|\n)/g, '<br/>'), {
// useNamedReferences: true,
// allowUnsafeSymbols: true
// }) : (containsHTML ? htmlToText.fromString(value) : value);
};
return source.replace(/\[([a-z0-9_.]+)(?:\/([^\]]+))?\]/ig, (match, identifier, fallback) => {