View difference between Paste ID: 8hebkE9s and

-
+		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';
 			$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 );
 
 		/* If this is a user object pass the users' email address for Gravatar so we don't have to refetch it. */
 		if ( 'user' == $object && empty($email) )
 			$email = $activities_template->activity->user_email;
 
 		return apply_filters( 'bp_get_activity_avatar', bp_core_fetch_avatar( array( 'item_id' => $item_id, 'object' => $object, 'type' => $type, 'alt' => $alt, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $email ) ) );
 	}