From d93add71fb1ecce744e30768e5eeb8a51d5717dd Mon Sep 17 00:00:00 2001
From: Evan Borgstrom <evan@borgstrom.ca>
Date: Thu, 13 Mar 2014 16:50:25 -0400
Subject: [PATCH] Be more specific in the condition before setting 'fields'

---
 polymorphic/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/polymorphic/admin.py b/polymorphic/admin.py
index d0c4f48..a41dc14 100644
--- a/polymorphic/admin.py
+++ b/polymorphic/admin.py
@@ -411,7 +411,7 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
         kwargs.setdefault('form', self.base_form or self.form)
 
         # prevent infinite recursion in django 1.6+
-        if not self.declared_fieldsets:
+        if 'fields' not in kwargs and not self.declared_fieldsets:
             kwargs['fields'] = None
 
         return super(PolymorphicChildModelAdmin, self).get_form(request, obj, **kwargs)