Merged in [13383] from rjsparks@nostrum.com:

Don't double-escape when showing feedback. Fixes #2297.
 - Legacy-Id: 13398
Note: SVN reference [13383] has been migrated to Git commit cf382d30bb
This commit is contained in:
Henrik Levkowetz 2017-05-19 20:10:02 +00:00
commit 26bd9283ef

View file

@ -4,6 +4,7 @@ import tempfile
from django import template
from django.conf import settings
from django.template.defaultfilters import linebreaksbr, force_escape
from django.utils.safestring import mark_safe
import debug # pyflakes:ignore
@ -70,4 +71,4 @@ def decrypt(string, request, year, plain=False):
if not plain:
return force_escape(linebreaksbr(out))
return wrap_text(force_escape(out))
return mark_safe(wrap_text(force_escape(out)))