AFPy/PonyConf
AFPy
/
PonyConf
7
2
Fork 3
Code Issues 10 Pull Requests 1 Projects Releases Wiki Activity

Revert "do not escape data for rendering emails text part" 

This reverts commit 9a17380938.
This commit is contained in:
Élie Bouttier 2016-11-09 23:25:43 +01:00
parent 7affeb8d5d
commit 8c249b56cc
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conversations/utils.py
View File

@ -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(