--- /buddypress/bp-activity/bp-activity-templatetags.php (BP 1.2 branch)	Fri Aug 06 09:26:18 2010
+++ /buddypress/bp-activity/bp-activity-templatetags.php (working copy)	Fri Aug 06 09:27:27 2010
@@ -415,14 +415,16 @@
 		$item_id = false;
 		if ( (int)$activities_template->activity->user_id )
 			$item_id = $activities_template->activity->user_id;
-		else if ( $activities_template->activity->item_id )
-			$item_id = $activities_template->activity->item_id;
 
 		$object = 'user';
-		if ( $bp->groups->id == $activities_template->activity->component && !(int) $activities_template->activity->user_id )
+		if ( $bp->groups->id == $activities_template->activity->component ) {
 			$object = 'group';
-		if ( $bp->blogs->id == $activities_template->activity->component && !(int) $activities_template->activity->user_id )
+			$item_id = $activities_template->activity->item_id;
+		}
+		if ( $bp->blogs->id == $activities_template->activity->component ) {
 			$object = 'blog';
+			$item_id = $activities_template->activity->item_id;
+		}
 
 		$object = apply_filters( 'bp_get_activity_avatar_object_' . $activities_template->activity->component, $object );