From 6d21727b034a1f0147c1be987aab27e4728a5199 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 15:48:51 +0100
Subject: [PATCH] Cleaned up database backend search method

---
 wagtail/wagtailsearch/backends/db.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py
index a7dca12e9..5ed8e07df 100644
--- a/wagtail/wagtailsearch/backends/db.py
+++ b/wagtail/wagtailsearch/backends/db.py
@@ -49,7 +49,7 @@ class DBSearch(BaseSearch):
 
         # Filter by terms
         for term in terms:
-            term_query = None
+            term_query = models.Q()
             for field_name in fields:
                 # Check if the field exists (this will filter out indexed callables)
                 try:
@@ -58,11 +58,8 @@ class DBSearch(BaseSearch):
                     continue
 
                 # Filter on this field
-                field_filter = {'%s__icontains' % field_name: term}
-                if term_query is None:
-                    term_query = models.Q(**field_filter)
-                else:
-                    term_query |= models.Q(**field_filter)
+                term_query |= models.Q(**{'%s__icontains' % field_name: term})
+
             query = query.filter(term_query)
 
         # Distinct