merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -10,6 +10,7 @@ Fixed:
 - fix dates-from-Dates (sf bug 984604)
 - fix messageid generated when msgid is None for send_message (sf bug 987933)
 - make user permissions check more sane (fix search page for anonymous)
+- fixed RDBMS filter() for no matches from full-text search (sf bug 990778)
 
 
 2004-06-24 0.7.5

roundup/backends/back_mysql.py

@@ -535,7 +535,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         property value to match is a list, any one of the values in the
         list may match for that property to match.
         '''
-        # just don't bother if the full-text search matched diddly
+        # we can't match anything if search_matches is empty
         if search_matches == {}:
             return []
 

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.98.2.16 2004-07-03 23:08:44 richard Exp $
+# $Id: rdbms_common.py,v 1.98.2.17 2004-07-19 00:38:54 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2064,7 +2064,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         property value to match is a list, any one of the values in the
         list may match for that property to match.
         '''
-        # just don't bother if the full-text search matched diddly
+        # we can't match anything if search_matches is empty
         if search_matches == {}:
             return []