summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Rosner <brosner@gmail.com>2008-03-31 21:04:54 +0000
committerBrian Rosner <brosner@gmail.com>2008-03-31 21:04:54 +0000
commitde072d889d1372ef3474ec44dc953cb4af501e06 (patch)
tree31a00720763bef0e5c3c48e0c2a4148ddee88a96
parent85471641f1c56a4fc5eaf9cc0e00ead64e447f59 (diff)
newforms-admin: Fixed #6226 -- allow_tags is now correctly honored and marks the data as safe. Thanks, michelts and jgelens.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/templatetags/admin_list.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index 711ab9bd91..87fad70ec3 100644
--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@@ -148,6 +148,8 @@ def items_for_result(cl, result):
# function has an "allow_tags" attribute set to True.
if not allow_tags:
result_repr = escape(result_repr)
+ else:
+ result_repr = mark_safe(result_repr)
else:
field_val = getattr(result, f.attname)