summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Kocherhans <joseph@jkocherhans.com>2010-02-22 22:14:31 +0000
committerJoseph Kocherhans <joseph@jkocherhans.com>2010-02-22 22:14:31 +0000
commit8c4f16657fd77de0a37b5658e5f9f5bee6a5bcb9 (patch)
treed94a3afed8f5c0b82669c9da01999222c6d6f3c6
parent8b415e7299aebd0c4109925d8fe366734810413a (diff)
[1.1.X] Fixed #12570. Removed unused fields from GenericForeignKey. Backport of r12492 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12495 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/contenttypes/generic.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py
index aca74d2525..6ce03bdf62 100644
--- a/django/contrib/contenttypes/generic.py
+++ b/django/contrib/contenttypes/generic.py
@@ -291,8 +291,6 @@ class BaseGenericInlineFormSet(BaseModelFormSet):
"""
A formset for generic inline objects to a parent.
"""
- ct_field_name = "content_type"
- ct_fk_field_name = "object_id"
def __init__(self, data=None, files=None, instance=None, save_as_new=None,
prefix=None, queryset=None):