diff -r -u \Ivan\back\Drupal\modules\5\activity\activity.module \Ivan\back\Drupal\modules\5\activity.new\activity.module
--- \Ivan\back\Drupal\modules\5\activity\activity.module	Wed Apr 08 14:24:46 2009
+++ \Ivan\back\Drupal\modules\5\activity.new\activity.module	Sat May 02 19:35:50 2009
@@ -479,7 +479,6 @@
  * @todo This should be replaced with views integration. Perhaps in 6.x.
  */
 function activity_get_activity($uids = ACTIVITY_ALL, $filters = NULL, $limit = NULL, $tablesort_headers = NULL) {
-
   $wheres = array();
 
   // Build the WHERE clause for user id.
@@ -553,7 +552,17 @@
   // Build the sql and do the query. Wrapping it in db_rewrite_sql allows other
   // modules to impose access restrictions on activity listings.
   $sql = "SELECT activity.*, activity_targets.target_uid, activity_targets.target_role
-    FROM {activity_targets} activity_targets INNER JOIN {activity} activity ON activity.aid = activity_targets.aid
+    FROM {activity} INNER JOIN
+    (
+      SELECT SUBSTRING_INDEX(name, '_', -1) target_role,
+      SUBSTRING_INDEX(SUBSTRING_INDEX(name, '_', 2), '_', -1) `type`,
+      SUBSTRING_INDEX(SUBSTRING_INDEX(name, '_', -2), '_', 1) operation
+
+      FROM {variable} WHERE name LIKE '%activity_%_%_%' AND `value` <> 's:0:\"\";'
+    ) v
+    ON activity.`type` = v.`type` AND activity.`operation` = v.`operation`
+    INNER JOIN {activity_targets}
+    ON activity.aid = activity_targets.aid AND activity_targets.target_role = v.target_role
     $where ";
   $tablesort_sql = tablesort_sql($tablesort_headers);
 
