Fixed #5631 -- When fieldsets contains a field that is on the same li…

…ne, it is now collapsable when collapse is set in classes. Thanks andybak for some research and Karen Tracey for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8177 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/contrib/admin/options.py

@@ -89,7 +89,7 @@ def __iter__(self):
             yield AdminField(self.form, field, is_first=(i == 0))
 
     def errors(self):
-        return mark_safe(u'\n'.join([self.form[f].errors.as_ul() for f in self.fields]))
+        return mark_safe(u'\n'.join([self.form[f].errors.as_ul() for f in self.fields]).strip('\n'))
 
 class AdminField(object):
     def __init__(self, form, field, is_first):