Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.246
diff -u -u -p -r1.246 search.module
--- modules/search/search.module	19 Dec 2007 17:45:42 -0000	1.246
+++ modules/search/search.module	3 Jan 2008 13:23:40 -0000
@@ -794,10 +794,13 @@ function search_parse_query($text) {
     // Single ANDed term
     else {
       $simple_and = TRUE;
-      list($q, $count) = _search_parse_query($key, $arguments2);
+      list($q, $count, $count2) = _search_parse_query($key, $arguments2);
       if ($q) {
         $query[] = $q;
         $arguments[] = $key;
+        if (!$count2) {
+          $simple = FALSE;
+        }
         // Each AND keyword needs to match at least once
         $matches += $count;
       }
@@ -828,6 +831,7 @@ function search_parse_query($text) {
  */
 function _search_parse_query(&$word, &$scores, $not = FALSE) {
   $count = 0;
+  $count2 = 0;
   // Determine the scorewords of this word/phrase
   if (!$not) {
     $split = explode(' ', $word);
@@ -839,11 +843,12 @@ function _search_parse_query(&$word, &$s
           $scores[$s] = $s;
           $count++;
         }
+        $count2++;
       }
     }
   }
   // Return matching snippet and number of added words
-  return array("d.data ". ($not ? 'NOT ' : '') ."LIKE '%% %s %%'", $count);
+  return array("d.data ". ($not ? 'NOT ' : '') ."LIKE '%% %s %%'", $count, $count2);
 }
 
 /**