Index: includes/flag_friend_handler_argument_numeric.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flag_friend/includes/Attic/flag_friend_handler_argument_numeric.inc,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 flag_friend_handler_argument_numeric.inc
--- includes/flag_friend_handler_argument_numeric.inc	14 Jan 2009 02:57:09 -0000	1.1.2.2
+++ includes/flag_friend_handler_argument_numeric.inc	28 Apr 2009 20:48:42 -0000
@@ -16,18 +16,17 @@ class flag_friend_handler_argument_numer
     else {
       $this->value = array($this->argument);
     }
-    
-    $this->query->set_where_group('OR', 'friends');
+    $group = $this->query->set_where_group('OR', 'friends');
     if (count($this->value) > 1) {
       $operator = empty($this->options['not']) ? 'IN' : 'NOT IN';
       $placeholders = implode(', ', array_fill(0, sizeof($this->value), '%d'));
-      $this->query->add_where('friends', "users.uid IN (SELECT f.friend_uid FROM {flag_friend} f WHERE f.uid $operator ($placeholders))", $this->value);
-      $this->query->add_where('friends', "users.uid IN (SELECT f.uid FROM {flag_friend} f WHERE f.friend_uid $operator ($placeholders))", $this->value);
+      $this->query->add_where($group, "users.uid IN (SELECT f.friend_uid FROM {flag_friend} f WHERE f.uid $operator ($placeholders))", $this->value);
+      $this->query->add_where($group, "users.uid IN (SELECT f.uid FROM {flag_friend} f WHERE f.friend_uid $operator ($placeholders))", $this->value);
     }
     else {
       $operator = empty($this->options['not']) ? '=' : '!=';
-      $this->query->add_where('friends', "users.uid IN (SELECT f.friend_uid FROM {flag_friend} f WHERE f.uid $operator %d)", $this->argument);
-      $this->query->add_where('friends', "users.uid IN (SELECT f.uid FROM {flag_friend} f WHERE f.friend_uid $operator %d)", $this->argument);
+      $this->query->add_where($group, "users.uid IN (SELECT f.friend_uid FROM {flag_friend} f WHERE f.uid $operator %d)", $this->argument);
+      $this->query->add_where($group, "users.uid IN (SELECT f.uid FROM {flag_friend} f WHERE f.friend_uid $operator %d)", $this->argument);
     }
   }
 }
\ No newline at end of file