--- activity.module.orig	2009-03-05 05:38:11.000000000 +0100
+++ activity.module	2009-03-23 09:42:46.000000000 +0100
@@ -453,7 +453,7 @@ function activity_get_info() {
  */
 function activity_insert($uid, $module, $type, $operation, $data, $target_users_roles) {
   // check time limit, ignore activity if within the limit
-  $result = db_query("SELECT COUNT(*) FROM {activity} WHERE uid = %d AND module = '%s' AND type = '%s' AND operation = '%s' AND data = '%s' AND created >= %d", $uid, $module, $type, $operation, serialize($data), (time() - variable_get('activity_time_limit', 30)));
+  $result = db_query("SELECT COUNT(*) AS count FROM {activity} WHERE uid = %d AND module = '%s' AND type = '%s' AND operation = '%s' AND data = '%s' AND created >= %d", $uid, $module, $type, $operation, serialize($data), (time() - variable_get('activity_time_limit', 30)));
   
   if (db_fetch_object($result)->count != 0) {
     return FALSE;
@@ -462,8 +462,9 @@ function activity_insert($uid, $module, 
   db_query("INSERT INTO {activity} (uid, module,  type,  operation,  created, data)
                             VALUES (%d,  '%s',    '%s',  '%s',       %d,      '%s')",
                                    $uid, $module, $type, $operation, time(),  serialize($data));
+	$aid = db_last_insert_id('activity', 'aid');
   foreach ($target_users_roles as $target_uid => $role) {
-    db_query("INSERT INTO {activity_targets} (aid, target_uid, target_role) VALUES (%d, %d, '%s')", db_last_insert_id('activity', 'aid'), $target_uid, $role);
+    db_query("INSERT INTO {activity_targets} (aid, target_uid, target_role) VALUES (%d, %d, '%s')", $aid, $target_uid, $role);
   }
 
   $activity = array(
@@ -1225,7 +1226,7 @@ function theme_activity_more_link($path)
  * Theme function for individual activity message.
  */
 function theme_activity($message, $item) {
-  $output = $item['mark'] .'<span class="activity activity-module-'. $item['module'] .' activity-type-'. $item['type'] .' activity-operation-'. $item['operation'] .'">'. $message .'</span>';
+  $output = (isset($item['mark'])?$item['mark']:'') .'<span class="activity activity-module-'. $item['module'] .' activity-type-'. $item['type'] .' activity-operation-'. $item['operation'] .'">'. $message .'</span>';
   $output .= '<span class="activity-links">';
 
   // If logged in user, then show link to add a comment to the activity record.