Node.js based forum software built for the modern web
fix: apply the default email payload and text direction in sendToEmail (#14863)
palmoni597c0f022e5a3
diff --git a/src/emailer.js b/src/emailer.jsindex 61b455f3c0..a7baac6570 100644--- a/src/emailer.js+++ b/src/emailer.js@@ -285,6 +285,11 @@ Emailer.sendToEmail = async (template, email, language, params) => {const lang = language || meta.config.defaultLang || 'en-GB';const unsubscribable = ['digest', 'notification'];+ params = { ...Emailer._defaultPayload, ...params };+ if (!params.hasOwnProperty('rtl')) {+ params.rtl = translator.languageDirection(lang) === 'rtl';+ }+// Digests and notifications can be one-click unsubbedlet payload = {template: template,diff --git a/src/user/invite.js b/src/user/invite.jsindex da10d2d42e..21bbd24a9f 100644--- a/src/user/invite.js+++ b/src/user/invite.js@@ -196,7 +196,6 @@ module.exports = function (User) {const subject = await translator.translate(`[[email:invite, ${title}]]`, meta.config.defaultLang);return {- ...emailer._defaultPayload, // Append default data to this email payloadsite_title: title,registerLink: registerLink,subject: subject,