Merge pull request #69 from regulusweb/fix/contact-body-escape

Fix rendering of special characters in plain text email body.

Author: solarissmoke

tests/test_tags.py

@@ -6,7 +6,7 @@
 
 from wagtail.core.models import Page
 from wagtail_extensions.templatetags.wagtailextensions_tags import (
-    bleachclean, page_menu_children, track_form_submission, menu)
+    page_menu_children, track_form_submission, menu)
 
 
 @pytest.mark.django_db
@@ -42,18 +42,6 @@ def func(template_string):
     return func
 
 
-def test_bleanclean_cleandata():
-    cleaned = bleachclean('Hello')
-
-    assert cleaned == 'Hello'
-
-
-def test_bleanclean_strips():
-    cleaned = bleachclean('<script>evil</script>')
-
-    assert cleaned == 'evil'
-
-
 def test_track_form_submission(rf):
     request = rf.get('/')
     request.session = {

wagtail_extensions/templates/wagtail_extensions/email/message.txt

@@ -1,7 +1,5 @@
-{% load bleachclean from wagtailextensions_tags %}
-
 {% autoescape off %}
 Enquiry from {{ name }} ({{ email }}):
-{% endautoescape %}
 
-{{ message|bleachclean }}
+{{ message|striptags }}
+{% endautoescape %}

wagtail_extensions/templatetags/wagtailextensions_tags.py

@@ -48,11 +48,6 @@ def humanize_date_range(start, end):
     return "{} - {}".format(start.strftime(start_fmt), end.strftime(day_fmt))
 
 
-@register.filter
-def bleachclean(value):
-    return bleach.clean(value, strip=True)
-
-
 @register.simple_tag
 def block_method(block_value, method_name):
     method = getattr(block_value.block, method_name)