From cccbaa622493d086a49d30e9a6a7dbd7a90561b1 Mon Sep 17 00:00:00 2001 From: Troy Grosfield Date: Thu, 21 Apr 2016 09:53:03 -0600 Subject: [PATCH] linebreak safe updates. --- django_core/templatetags/html_tags.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/django_core/templatetags/html_tags.py b/django_core/templatetags/html_tags.py index 7b266a7..856c1b3 100644 --- a/django_core/templatetags/html_tags.py +++ b/django_core/templatetags/html_tags.py @@ -1,18 +1,18 @@ from django import template -from django.utils.html import linebreaks -from django.utils.safestring import mark_safe +from django.template.defaultfilters import linebreaks_filter from django.utils.six import string_types +# from django.utils.html import linebreaks register = template.Library() @register.filter -def linebreaks_safe(value): +def linebreaks_safe(value, autoescape=True): """ Adds linebreaks only for text that has a newline character. """ if isinstance(value, string_types) and '\n' in value: - return mark_safe(linebreaks(value)) + return linebreaks_filter(value, autoescape=autoescape) return value