Index: activitystream.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activitystream/activitystream.module,v
retrieving revision 1.2.2.12
diff -u -p -r1.2.2.12 activitystream.module
--- activitystream.module	16 May 2009 16:40:20 -0000	1.2.2.12
+++ activitystream.module	10 Jul 2009 16:43:31 -0000
@@ -295,9 +295,17 @@ function activitystream_feed($uid = 0) {
   }
   
   foreach ($items as $item) {
-    if (function_exists('theme_'. $item->module .'_item')) {
-      $theme_function = $item->module .'_item';
-    } 
+    if (function_exists($action->module .'_theme')) {
+      $theme_functions = $action->module . '_theme';
+      $theme_functions = $theme_functions();
+
+      if (array_key_exists($action->module . '_item', $theme_functions)) {
+        $theme_function = $action->module .'_item';
+      }
+      else {
+        $theme_function = 'activitystream_item';
+      }
+    }
     else {
       $theme_function = 'activitystream_item';
     }