diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-08-16 20:40:00 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-08-16 20:40:00 +0000 |
| commit | c127f0117d75220e346625cd8a009fb6a317ece1 (patch) | |
| tree | fbf763d891fa7e216f5e3afede893af3797914cb /django/utils/tree.py | |
| parent | 4dece4fba1d8357cf9e4887486d6768e4dc49ca6 (diff) | |
Fixed #8283 -- Fixed an edge case when adding things to the "where" tree and
combining different connector types.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/tree.py')
| -rw-r--r-- | django/utils/tree.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/tree.py b/django/utils/tree.py index 5dd9f56799..a9028b834b 100644 --- a/django/utils/tree.py +++ b/django/utils/tree.py @@ -87,7 +87,7 @@ class Node(object): Otherwise, the whole tree is pushed down one level and a new root connector is created, connecting the existing tree and the new node. """ - if node in self.children: + if node in self.children and conn_type == self.connector: return if len(self.children) < 2: self.connector = conn_type |