Index: activity.module
===================================================================
--- activity.module	(revision 6003)
+++ activity.module	(working copy)
@@ -350,7 +350,7 @@
   }
 
   if ($op == 'publish') {
-    $rows = db_query("SELECT a.aid, a.status as activity_status, u.status as user_status, n.status as node_status FROM {activity} a INNER JOIN {users} u ON a.uid = u.uid INNER JOIN {node} n ON a.nid = n.nid WHERE a.uid <> 0 AND a.type = 'comment' AND a.eid = %d", $comment->cid);
+    $rows = db_query("SELECT a.aid, a.status as activity_status, u.status as user_status, n.status as node_status FROM {activity} a INNER JOIN {users} u ON a.uid = u.uid INNER JOIN {node} n ON a.nid = n.nid WHERE a.eid = %d AND a.type = 'comment' AND a.uid <> 0", $comment->cid);
 
     $update_statuses = array();
 
@@ -389,7 +389,7 @@
 
   if ($op == 'update') {
     // Find all the Activities for this node and determine status bit for each.
-    $db_result = db_query("SELECT a.aid, u.status as user_status, a.status as activity_status FROM {activity} a INNER JOIN {users} u ON u.uid = a.uid WHERE a.uid <> 0 AND a.nid = %d", $node->nid);
+    $db_result = db_query("SELECT a.aid, u.status as user_status, a.status as activity_status FROM {activity} a INNER JOIN {users} u ON u.uid = a.uid WHERE a.nid = %d AND a.uid <> 0", $node->nid);
 
     $update_statuses = array();
     while ($row = db_fetch_object($db_result)) {
Index: activity.install
===================================================================
--- activity.install	(revision 6003)
+++ activity.install	(working copy)
@@ -75,6 +75,8 @@
       'eid' => array('eid'),
       'created' => array('created'), // Probably not at all useful.
       'actions_id' => array('actions_id'),
+      'eid_type_uid' => array('eid', 'type', 'uid'),
+      'nid_uid' => array('nid', 'uid'),
     ),
   );
   
@@ -263,4 +265,14 @@
  );
 
   return $ret;
-}
\ No newline at end of file
+}
+
+/**
+ * Add indexes to {activity}.
+ */
+function activity_update_6204() {
+  $ret = array();
+  db_add_index($ret, 'activity', 'eid_type_uid', array('eid', 'type', 'uid'));
+  db_add_index($ret, 'activity', 'nid_uid', array('nid', 'uid'));
+  return $ret;
+}