From ab6a97cb4a9d16c31d320615caa043330da97e3b Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Tue, 7 Feb 2006 00:51:42 +0000 Subject: [PATCH] magic-removal: Fixed bug in combining ordered QuerySets git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2288 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/db/models/query.py b/django/db/models/query.py index c5e0f819c4..1cacd9b59e 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -288,7 +288,7 @@ class QuerySet(object): combined = other._clone() # If 'self' is ordered and 'other' isn't, propagate 'self's ordering if (self._order_by is not None and len(self._order_by) > 0) and \ - (combined._order_by is None or len(combined._order_by == 0)): + (combined._order_by is None or len(combined._order_by) == 0): combined._order_by = self._order_by return combined