Index: activity.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/activity/activity.module,v
retrieving revision 1.1.2.2.2.30.2.45
diff -u -p -r1.1.2.2.2.30.2.45 activity.module
--- activity.module	27 May 2009 07:52:26 -0000	1.1.2.2.2.30.2.45
+++ activity.module	3 Jun 2009 18:17:49 -0000
@@ -701,7 +701,7 @@ function activity_get_activity($uids = A
     $row['data']['uid'] 		= $row['uid'];
     $row['data']['module'] 		= $row['module'];
     $row['data']['type'] 		= $row['type'];
-    $row['data']['operation'] 	= ($row['data']['operation'] ? $row['data']['operation'] : $row['operation']);
+    $row['data']['operation'] 	= (isset($row['data']['operation']) ? $row['data']['operation'] : $row['operation']);
     $row['data']['created'] 	= $row['created'];
 
     // Load Activity comments if user can view comments
@@ -1338,7 +1338,10 @@ 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 = '';
+  if (isset($item['mark'])) {
+    $output = $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 user has permission to create an activity comment then show link to add comment
@@ -1430,7 +1433,7 @@ function activity_load($aid) {
     $row['data']['uid']	= $row['uid'];
     $row['data']['module'] = $row['module'];
     $row['data']['type'] = $row['type'];
-    $row['data']['operation']	= ($row['data']['operation'] ? $row['data']['operation'] : $row['operation']);
+    $row['data']['operation']	= (isset($row['data']['operation']) ? $row['data']['operation'] : $row['operation']);
     $row['data']['created'] = $row['created'];
 
     // Load Activity comments
Index: views-view-row-activity.tpl.php
===================================================================
RCS file: /cvs/drupal/contributions/modules/activity/Attic/views-view-row-activity.tpl.php,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views-view-row-activity.tpl.php
--- views-view-row-activity.tpl.php	28 Apr 2009 16:37:00 -0000	1.1.2.1
+++ views-view-row-activity.tpl.php	3 Jun 2009 18:17:49 -0000
@@ -9,6 +9,6 @@
 ?>
 <?php print $row->activity_message; ?>
   
-<?php if ($info): ?>
+<?php if (isset($info)): ?>
   <?php print $info; ?>
 <?php endif; ?>