Merge pull request #5925 from RocketChat/email-template-data

Fix #5914, passing the data to the placeholder replacement.
9 years ago · ff69864587
parent 26d0a4f09b 2cafd09672
commit ff69864587
1 changed files with 3 additions and 2 deletions
--- a/server/methods/sendForgotPasswordEmail.js
+++ b/server/methods/sendForgotPasswordEmail.js
@ -11,8 +11,9 @@ Meteor.methods({
 			email = (user.emails || []).map(item => item.address).find(userEmail => regex.test(userEmail));

 			if (RocketChat.settings.get('Forgot_Password_Customized')) {
-				const subject = RocketChat.placeholders.replace(RocketChat.settings.get('Forgot_Password_Email_Subject') || '');
-				const html = RocketChat.placeholders.replace(RocketChat.settings.get('Forgot_Password_Email') || '');
+				const data = { name: user.name, email };
+				const subject = RocketChat.placeholders.replace(RocketChat.settings.get('Forgot_Password_Email_Subject') || '', data);
+				const html = RocketChat.placeholders.replace(RocketChat.settings.get('Forgot_Password_Email') || '', data);

 				Accounts.emailTemplates.resetPassword.subject = function(/*userModel*/) {
 					return subject;