Index: activity.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activity/activity.module,v
retrieving revision 1.1.2.2.2.30.2.31.2.54
diff -u -p -r1.1.2.2.2.30.2.31.2.54 activity.module
--- activity.module	17 Sep 2009 22:22:07 -0000	1.1.2.2.2.30.2.31.2.54
+++ activity.module	19 Sep 2009 23:07:09 -0000
@@ -352,10 +352,12 @@ function activity_token_list($type = 'al
 
 function activity_token_values($type, $object = NULL, $options = array()) {
   $token_values = array();
-  foreach (activity_get_module_info() as $module => $info) {
-    if (function_exists($module .'_activity_token_values')) {
-      if ($type == $module) {
-        $token_values = array_merge($token_values, call_user_func($module .'_activity_token_values', $module, $object));
+  if (!empty($object)) {
+    foreach (activity_get_module_info() as $module => $info) {
+      if (function_exists($module .'_activity_token_values')) {
+        if ($type == $module) {
+          $token_values = array_merge($token_values, call_user_func($module .'_activity_token_values', $module, $object));
+        }
       }
     }
   }