From 8c249b56cc5eea6ac30c747ae0c169a71e43a40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Wed, 9 Nov 2016 23:25:43 +0100 Subject: [PATCH] Revert "do not escape data for rendering emails text part" This reverts commit 9a173809385f129bd8b64cea99935daa7b63c8b8. --- conversations/utils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conversations/utils.py b/conversations/utils.py index 5b8a14f..1a48cda 100644 --- a/conversations/utils.py +++ b/conversations/utils.py @@ -5,7 +5,6 @@ from django.core import mail from django.core.mail import EmailMultiAlternatives from django.template.loader import render_to_string from django.utils.crypto import get_random_string -from django.utils.safestring import mark_safe def hexdigest_sha256(*args): @@ -40,7 +39,7 @@ def notify_by_email(template, data, subject, sender, dests, message_id, ref=None if hasattr(settings, 'REPLY_EMAIL') and hasattr(settings, 'REPLY_KEY'): data.update({'answering': True}) - text_message = render_to_string('conversations/emails/%s.txt' % template, {k: mark_safe(v) for k, v in data.items()}) + text_message = render_to_string('conversations/emails/%s.txt' % template, data) html_message = render_to_string('conversations/emails/%s.html' % template, data) from_email = '{name} <{email}>'.format(