Index: storm.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/storm.module,v
retrieving revision 1.10.4.62
diff -u -p -r1.10.4.62 storm.module
--- storm.module	16 Dec 2010 23:32:22 -0000	1.10.4.62
+++ storm.module	21 Feb 2011 21:33:17 -0000
@@ -969,12 +969,8 @@ function storm_get_assignment_options($o
     }
   }
   if (module_exists('stormteam')) {
-    $sql = "SELECT  n.nid,
-                    n.title,
-                    ste.members
+    $sql = "SELECT n.nid
                 FROM {node} n
-                INNER JOIN {stormteam} ste
-                  ON n.vid = ste.vid
                 WHERE n.type = 'stormteam'
                 ORDER BY n.title ASC";
     $sql = stormteam_access_sql($sql);
@@ -982,10 +978,11 @@ function storm_get_assignment_options($o
     $result = db_query($sql);
     while ($team = db_fetch_object($result)) {
       if (!array_key_exists($team->nid, $options[$teams])) {
+        $team_node = node_load($team->nid);
         $add_team = TRUE;
         if (isset($organization_nid)) {
           //Check if all team members are relevant to current org or project
-          foreach (unserialize($team->members) as $nid => $name) {
+          foreach ($team_node->members_array as $nid => $name) {
             if (!array_key_exists($nid, $options[$people])) {
               $add_team = FALSE;
               break;
@@ -993,7 +990,7 @@ function storm_get_assignment_options($o
           }
         }
         if ($add_team) {
-          $options[$teams][$team->nid] = check_plain($team->title);
+          $options[$teams][$team_node->nid] = check_plain($team_node->title);
         }
       }
     }
Index: stormteam/stormteam.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormteam/stormteam.module,v
retrieving revision 1.1.2.28.2.4
diff -u -p -r1.1.2.28.2.4 stormteam.module
--- stormteam/stormteam.module	20 Feb 2011 12:30:08 -0000	1.1.2.28.2.4
+++ stormteam/stormteam.module	21 Feb 2011 21:33:17 -0000
@@ -191,7 +191,7 @@ function stormteam_access_sql($sql, $whe
   }
   if (user_access('Storm team: view belonged')) {
     if (!empty($cond)) $cond .= ' OR ';
-    $cond .= "ste.members LIKE '%i:". $user->stormperson_nid .";%'";
+    $cond .= "ste.mnid =  ". $user->stormperson_nid;
   }
   if (empty($cond)) $cond = '0=1';
   $where[] = $cond;
@@ -222,15 +222,16 @@ function stormteam_storm_rewrite_where_s
     $cond = '';
     if (user_access('Storm team: view own', $account)) {
       $cond .= " ${primary_table}.uid=". $account->uid;
+
     }
     if (user_access('Storm team: view belonged', $account)) {
       if ($cond) {
         $cond .= ' OR ';
       }
-      $cond .= "ste1.members LIKE '%i:". $account->stormperson_nid .";%'";
+      $cond .= "ste1.mnid = ". $account->stormperson_nid;
     }
     if ($cond) {
-      $cond = " WHEN 'stormteam' THEN (SELECT IF($cond,1,0) FROM {stormteam} ste1 WHERE ste1.vid=${primary_table}.vid) ";
+      $cond = " WHEN 'stormteam' THEN (SELECT DISTINCT 1 FROM {stormteam} ste1 WHERE ste1.vid=${primary_table}.vid AND ($cond)) ";
     }
     else {
       $cond = " WHEN 'stormteam' THEN 0 ";
@@ -693,7 +694,7 @@ function stormteam_user_return_teams($ac
   }
 
   // Get the list of team nodes. Include organizations which the person is a member of.
-  $s = "SELECT ste.nid FROM {stormteam} ste JOIN {stormperson} stp ON (stp.nid = ste.mnid OR stp.orgnization_nid = ste.mnid) WHERE stp.user_uid = %d";
+  $s = "SELECT ste.nid FROM {stormteam} ste JOIN {stormperson} stp ON (stp.nid = ste.mnid OR stp.organization_nid = ste.mnid) WHERE stp.user_uid = %d";
   $r = db_query($s, $account->uid);
   $teams = array();
   while ($team = db_fetch_object($r)) {