Commit a14fc400 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #7913 -- Corrected ham-fisted typo from [8102]. Thanks to evinrik for the report. 

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

django/db/models/fields/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ class Field(object): 
    def get_flatchoices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH):

        "Returns flattened choices with a default blank choice included."

        first_choice = include_blank and blank_choice or []

        return first_choices + list(self.flatchoices)

        return first_choice + list(self.flatchoices)



    def _get_val_from_obj(self, obj):

        if obj: