[django/django] b10742: [1.6.x] Fixed #21410 -- prefetch_related() for For...

[GitHub]

Branch: refs/heads/stable/1.6.x
Home: https://github.com/django/django
Commit: b107421acfc4046ffaa799aceef2c3b4877207f2
https://github.com/django/django/commit/b107421acfc4046ffaa799aceef2c3b4877207f2
Author: Loic Bistuer <loic.b...@sixmedia.com>
Date: 2013-11-12 (Tue, 12 Nov 2013)

Changed paths:
M django/db/models/fields/related.py
M tests/prefetch_related/models.py
M tests/prefetch_related/tests.py

Log Message:
-----------
[1.6.x] Fixed #21410 -- prefetch_related() for ForeignKeys with related_name='+'

Regression introduced by commit 9777442.

Thanks to trac username troygrosfield for the report and test case.

Backpatch of cb83448891f2920c926f61826d8eae4051a3d8f2 from master.

Conflicts:

tests/prefetch_related/models.py