summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-11-20 01:37:01 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-11-20 01:37:01 +0000
commitb1d40295bc9a176973903a242a35caeb987b4bfc (patch)
treeeea5f3dc6eaf5a80ea74e3084198282a81b962f5
parent6522e0697a84a7628decbc86e2954b5cd430d0c0 (diff)
Fixed #5973 -- Fixed inadvertent allow_tags=True auto-escaping problem.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6703 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 b23013becd..e49848f46f 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)