Ticket #766: admin_list.patch

django/contrib/admin/templatetags/admin_list.py

@@ -156 +156 @@
             # For non-field list_display values, the value is a method
             # name. Execute the method.
             try:
-                result_repr = strip_tags(str(getattr(result, field_name)()))
+                func = getattr(result, field_name)
+                try:
+                    if func.allow_tags:
+                        result_repr = str(func())
+                    else:
+                                                raise AttributeError
+                except AttributeError:
+                        result_repr = strip_tags(str(func()))
             except ObjectDoesNotExist:
                 result_repr = EMPTY_CHANGELIST_VALUE
         else: