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

Fixed Merge Tags #206 #236

Browse source
This commit is contained in:
witzig 2017-06-02 00:24:26 +02:00
parent 6d39d497ee
commit 466bf225a3
5 changed files with 82 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/tools.js
View file

@ -200,17 +200,23 @@ function formatMessage(serviceUrl, campaign, list, subscription, message, filter
return links[key];
}
if (subscription.mergeTags.hasOwnProperty(key)) {
return isHTML ? he.encode((subscription.mergeTags[key] || ''), {
let value = (subscription.mergeTags[key] || '').toString();
// FIXME https://github.com/Mailtrain-org/mailtrain/issues/192
return isHTML ? he.encode(value, {
useNamedReferences: true
}) : subscription.mergeTags[key];
}) : value;
}
return false;
};
return message.replace(/\[([a-z0-9_]+)(?:\/([^\]]+))?\]/ig, (match, identifier, fallback) => {
identifier = identifier.toUpperCase();
let value = (getValue(identifier) || fallback || '').trim();
return value ? filter(value) : match;
let value = getValue(identifier);
if (value === false) {
return match;
}
value = (value || fallback || '').trim();
return filter(value);
});
}
@ -310,4 +316,3 @@ function mergeTemplateIntoLayout(template, layout, callback) {
return done(template, layout);
}
}