From d0c49bfc60ce1f33f1bb1908482a0ee4e99d6525 Mon Sep 17 00:00:00 2001 From: Joseph Kocherhans Date: Fri, 30 Nov 2007 23:48:35 +0000 Subject: newforms-admin: Merged from trunk up to [6782]. git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6783 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/template/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/template') diff --git a/django/template/__init__.py b/django/template/__init__.py index c68a4b544d..9b1868cfce 100644 --- a/django/template/__init__.py +++ b/django/template/__init__.py @@ -804,7 +804,7 @@ class NodeList(list): bits.append(self.render_node(node, context)) else: bits.append(node) - return ''.join([force_unicode(b) for b in bits]) + return mark_safe(''.join([force_unicode(b) for b in bits])) def get_nodes_by_type(self, nodetype): "Return a list of all nodes of the given type" -- cgit v1.3