From 134c44bef0248337d7ad39f2d93262fb4e9e26c8 Mon Sep 17 00:00:00 2001
From: Evan Borgstrom <evan@borgstrom.ca>
Date: Thu, 13 Mar 2014 16:39:13 -0400
Subject: [PATCH] Prevent infinite recursion in Django 1.6

---
 polymorphic/admin.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/polymorphic/admin.py b/polymorphic/admin.py
index db1c8b2..d0c4f48 100644
--- a/polymorphic/admin.py
+++ b/polymorphic/admin.py
@@ -409,6 +409,11 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
         # Instead, pass the form unchecked here, because the standard ModelForm will just work.
         # If the derived class sets the model explicitly, respect that setting.
         kwargs.setdefault('form', self.base_form or self.form)
+
+        # prevent infinite recursion in django 1.6+
+        if not self.declared_fieldsets:
+            kwargs['fields'] = None
+
         return super(PolymorphicChildModelAdmin, self).get_form(request, obj, **kwargs)