Fix search() behavior again

This commit is contained in:
Kovid Goyal 2010-05-24 15:53:00 -06:00
parent 786ab0ef80
commit c0fbc32e4c

View File

@ -628,14 +628,13 @@ class ResultCache(SearchQueryParser):
def search(self, query, return_matches=False, def search(self, query, return_matches=False,
ignore_search_restriction=False): ignore_search_restriction=False):
if not query or not query.strip():
q = '' q = ''
if not query or not query.strip():
if not ignore_search_restriction: if not ignore_search_restriction:
q = self.search_restriction q = self.search_restriction
else: else:
if ignore_search_restriction: q = query
q = u'%s' % query if not ignore_search_restriction:
else:
q = u'%s (%s)' % (self.search_restriction, query) q = u'%s (%s)' % (self.search_restriction, query)
if not q: if not q:
if return_matches: if return_matches: