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

Various fixes

Browse source
This commit is contained in:
Tomas Bures 2019-03-09 07:42:14 +00:00
parent 4a6aed4cf7
commit 97bb700334
5 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/lib/subscription-mail-helpers.js
View file

@ -129,7 +129,7 @@ async function _sendMail(list, email, template, locale, subjectKey, relativeUrls
};
if (list.default_form) {
const form = await forms.getById(contextHelpers.getAdminContext(), list.default_form);
const form = await forms.getById(contextHelpers.getAdminContext(), list.default_form, false);
text.template = form['mail_' + template + '_text'] || text.template;
html.template = form['mail_' + template + '_html'] || html.template;

2
server/routes/subscription.js
View file

@ -675,7 +675,7 @@ async function webNotice(type, req, res) {
}
};
await injectCustomFormData(req.query.fid || list.default_form, 'web_' + type + '_notice', data);
await injectCustomFormData(req.query.fid || list.default_form, 'web_' + type.replace('-', '_') + '_notice', data);
const htmlRenderer = await tools.getTemplate(data.template, req.locale);