diff options
| author | Joseph Kocherhans <joseph@jkocherhans.com> | 2007-11-30 23:48:35 +0000 |
|---|---|---|
| committer | Joseph Kocherhans <joseph@jkocherhans.com> | 2007-11-30 23:48:35 +0000 |
| commit | d0c49bfc60ce1f33f1bb1908482a0ee4e99d6525 (patch) | |
| tree | 8a841ed15ae5b28854a0840e46ee0a60e1883978 /django/template/__init__.py | |
| parent | fcb30a11d8c289632c271d1c4b9993d7ee4c2b9b (diff) | |
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
Diffstat (limited to 'django/template/__init__.py')
| -rw-r--r-- | django/template/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
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" |