Remove unnecessary setting redefinition (#17587)

app/mailer/server/api.js

@@ -23,7 +23,7 @@ settings.get('Language', (key, value) => {
 	lng = value || 'en';
 });
 
-export const replacekey = (str, key, value = '') => str.replace(new RegExp(`(\\[${ key }\\]|__${ key }__)`, 'igm'), value);
+export const replacekey = (str, key, value = '') => str.replace(new RegExp(`(\\[${ key }\\]|__${ key }__)`, 'igm'), s.escapeHTML(value));
 export const translate = (str) => str.replace(/\{ ?([^\} ]+)(( ([^\}]+))+)? ?\}/gmi, (match, key) => TAPi18n.__(key, { lng }));
 export const replace = function replace(str, data = {}) {
 	if (!str) {

server/methods/registerUser.js

@@ -3,18 +3,11 @@ import { Match, check } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
 import s from 'underscore.string';
 
-import * as Mailer from '../../app/mailer';
 import { Users } from '../../app/models';
 import { settings } from '../../app/settings';
 import { saveCustomFields, validateEmailDomain, passwordPolicy } from '../../app/lib';
 import { validateInviteToken } from '../../app/invites/server/functions/validateInviteToken';
 
-let verifyEmailTemplate = '';
-Meteor.startup(() => {
-	Mailer.getTemplateWrapped('Verification_Email', (value) => {
-		verifyEmailTemplate = value;
-	});
-});
 Meteor.methods({
 	registerUser(formData) {
 		const AllowAnonymousRead = settings.get('Accounts_AllowAnonymousRead');
@@ -86,11 +79,6 @@ Meteor.methods({
 		saveCustomFields(userId, formData);
 
 		try {
-			const subject = Mailer.replace(settings.get('Verification_Email_Subject'));
-
-			Accounts.emailTemplates.verifyEmail.subject = () => subject;
-			Accounts.emailTemplates.verifyEmail.html = (userModel, url) => Mailer.replace(Mailer.replacekey(verifyEmailTemplate, 'Verification_Url', url), userModel);
-
 			Accounts.sendVerificationEmail(userId, userData.email);
 		} catch (error) {
 			// throw new Meteor.Error 'error-email-send-failed', 'Error trying to send email: ' + error.message, { method: 'registerUser', message: error.message }