Changeset 2381

Timestamp:

01/20/2010 04:21:20 PM (15 years ago)

Author:

apeatling

Message:

Standardizing activity stream fields and splitting the action from the content for better manageability.

Location:

trunk

Files:

• bp-activity.php (modified) (17 diffs)
• bp-activity/bp-activity-classes.php (modified) (20 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (10 diffs)
• bp-blogs.php (modified) (14 diffs)
• bp-core.php (modified) (1 diff)
• bp-core/bp-core-activation.php (modified) (1 diff)
• bp-friends.php (modified) (6 diffs)
• bp-groups.php (modified) (14 diffs)
• bp-themes/bp-default/_inc/css/default.css (modified) (3 diffs)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)
• bp-themes/bp-default/activity/entry.php (modified) (1 diff)
• bp-themes/bp-default/activity/index.php (modified) (1 diff)
• bp-themes/bp-sn-parent/_inc/ajax.php (modified) (3 diffs)
• bp-xprofile.php (modified) (3 diffs)

trunk/bp-activity.php

@@ -1 +1 @@
 <?php
 
-define ( 'BP_ACTIVITY_DB_VERSION', '2020' );
+define ( 'BP_ACTIVITY_DB_VERSION', '2031' );
 
 /* Define the slug for the component */
@@ -18 +18 @@
 
     /* Rename the old user activity cached table if needed. */
-    $wpdb->query( "RENAME TABLE {$wpdb->base_prefix}bp_activity_user_activity_cached TO {$bp->activity->table_name}" );
-
+    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$wpdb->base_prefix}bp_activity_user_activity_cached%'" ) ) {
+        $wpdb->query( "RENAME TABLE {$wpdb->base_prefix}bp_activity_user_activity_cached TO {$bp->activity->table_name}" );
+    }
+
+    /* Rename fields from pre BP 1.2 */
+    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->activity->table_name}%'" ) ) {
+        $wpdb->query( "ALTER TABLE {$bp->activity->table_name} CHANGE type type varchar(75) NOT NULL" );
+        $wpdb->query( "ALTER TABLE {$bp->activity->table_name} CHANGE component component varchar(75) NOT NULL" );
+    }
+
+    /**
+     * Build the tables
+     */
     $sql[] = "CREATE TABLE {$bp->activity->table_name} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 user_id bigint(20) NOT NULL,
-                component_name varchar(75) NOT NULL,
-                component_action varchar(75) NOT NULL,
+                component varchar(75) NOT NULL,
+                type varchar(75) NOT NULL,
+                action text NOT NULL
                 content longtext NOT NULL,
                 primary_link varchar(150) NOT NULL,
                 item_id varchar(75) NOT NULL,
-                secondary_item_id varchar(75) NOT NULL,
+                secondary_item_id varchar(75) DEFAULT NULL,
                 date_recorded datetime NOT NULL,
                 hide_sitewide bool DEFAULT 0,
@@ -36 +48 @@
                 KEY user_id (user_id),
                 KEY item_id (item_id),
-                KEY component_name (component_name)
+                KEY component (component)
                ) {$charset_collate};";
 
@@ -167 +179 @@
     $has_access = true;
     /* Redirect based on the type of activity */
-    if ( $activity->component_name == $bp->groups->id ) {
+    if ( $activity->component == $bp->groups->id ) {
         if ( !function_exists( 'groups_get_group' ) )
             bp_core_redirect( $bp->root_domain );
@@ -248 +260 @@
     $redirect = false;
     /* Redirect based on the type of activity */
-    if ( $activity->component_name == $bp->groups->id ) {
+    if ( $activity->component == $bp->groups->id ) {
         if ( $activity->user_id )
             $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug . '/' . $activity->id;
@@ -445 +457 @@
         'id' => false, // Pass an existing activity ID to update an existing entry.
 
-        'content' => false, // The content of the activity item
-        'primary_link' => false, // The primary URL for this item in RSS feeds
-        'component_name' => false, // The name/ID of the component e.g. groups, profile, mycomponent
-        'component_action' => false, // The component action e.g. activity_update, profile_updated
+        'action' => '', // The activity action - e.g. "Jon Doe posted an update"
+        'content' => '', // Optional: The content of the activity item e.g. "BuddyPress is awesome guys!"
+
+        'component' => false, // The name/ID of the component e.g. groups, profile, mycomponent
+        'type' => false, // The activity type e.g. activity_update, profile_updated
+        'primary_link' => '', // Optional: The primary URL for this item in RSS feeds (defaults to activity permalink)
 
         'user_id' => $bp->loggedin_user->id, // Optional: The user to record the activity for, can be false if this activity is not for a user.
@@ -460 +474 @@
     extract( $params, EXTR_SKIP );
 
-    /* Insert the "time-since" placeholder */
-    if ( $content )
+    /* Make sure we are backwards compatible */
+    if ( empty( $component ) && !empty( $component_name ) )
+        $component = $component_name;
+
+    if ( empty( $type ) && !empty( $component_action ) )
+        $type = $component_action;
+
+    /* Insert the "time-since" placeholder (use content if action empty for backwards compat) */
+    if ( !empty( $action ) )
+        $action = bp_activity_add_timesince_placeholder( $action );
+    else if ( empty( $action ) && !empty( $content ) )
         $content = bp_activity_add_timesince_placeholder( $content );
 
+    /* Remove any images and replace the first image with a thumbnail */
+    //$content = bp_activity_thumbnail_images( $content );
+
     $activity = new BP_Activity_Activity( $id );
 
     $activity->user_id = $user_id;
+    $activity->component = $component;
+    $activity->type = $type;
+    $activity->action = $action;
     $activity->content = $content;
     $activity->primary_link = $primary_link;
-    $activity->component_name = $component_name;
-    $activity->component_action = $component_action;
     $activity->item_id = $item_id;
     $activity->secondary_item_id = $secondary_item_id;
@@ -480 +507 @@
 
     /* If this is an activity comment, rebuild the tree */
-    if ( 'activity_comment' == $activity->component_action )
+    if ( 'activity_comment' == $activity->type )
         BP_Activity_Activity::rebuild_activity_comment_tree( $activity->item_id );
 
@@ -499 +526 @@
     extract( $r, EXTR_SKIP );
 
-    if ( empty($content) || empty($content) )
+    if ( empty( $content ) )
         return false;
 
     /* Record this on the user's profile */
     $from_user_link = bp_core_get_userlink( $user_id );
-    $activity_content = sprintf( __('%s posted an update:', 'buddypress'), $from_user_link );
-    $activity_content .= '<div class="activity-inner">' . $content . '</div>';
+    $activity_action = sprintf( __( '%s posted an update:', 'buddypress' ), $from_user_link );
+    $activity_content = '<div class="activity-inner">' . $content . '</div>';
 
     $primary_link = bp_core_get_userlink( $user_id, false, true );
@@ -512 +539 @@
     $activity_id = bp_activity_add( array(
         'user_id' => $user_id,
+        'action' => apply_filters( 'bp_activity_new_update_action', $activity_action ),
         'content' => apply_filters( 'bp_activity_new_update_content', $activity_content ),
         'primary_link' => apply_filters( 'bp_activity_new_update_primary_link', $primary_link ),
-        'component_name' => $bp->activity->id,
-        'component_action' => 'activity_update'
+        'component' => $bp->activity->id,
+        'type' => 'activity_update'
     ) );
 
@@ -552 +580 @@
         'content' => apply_filters( 'bp_activity_comment_content', $comment_header . '<div class="activity-inner">' . $content . '</div>' ),
         'primary_link' => '',
-        'component_name' => $bp->activity->id,
-        'component_action' => 'activity_comment',
+        'component' => $bp->activity->id,
+        'type' => 'activity_comment',
         'user_id' => $user_id,
         'item_id' => $activity_id,
@@ -588 +616 @@
     $defaults = array(
         'item_id' => false,
-        'component_name' => false,
-        'component_action' => false, // optional
+        'component' => false,
+        'type' => false, // optional
         'user_id' => false, // optional
         'secondary_item_id' => false // optional
@@ -597 +625 @@
     extract( $r, EXTR_SKIP );
 
-    if ( !$activity_ids_deleted = BP_Activity_Activity::delete_by_item_id( $item_id, $component_name, $component_action, $user_id, $secondary_item_id ) )
-        return false;
-
-    do_action( 'bp_activity_delete_by_item_id', $item_id, $component_name, $component_action, $user_id, $secondary_item_id );
+    if ( !$activity_ids_deleted = BP_Activity_Activity::delete_by_item_id( $item_id, $component, $type, $user_id, $secondary_item_id ) )
+        return false;
+
+    do_action( 'bp_activity_delete_by_item_id', $item_id, $component, $type, $user_id, $secondary_item_id );
     do_action( 'bp_activity_deleted_activities', $activity_ids_deleted );
 
@@ -616 +644 @@
 }
 
-function bp_activity_delete_by_content( $user_id, $content, $component_name, $component_action ) {
+function bp_activity_delete_by_content( $user_id, $content, $component, $type ) {
     /* Insert the "time-since" placeholder to match the existing content in the DB */
     $content = bp_activity_add_timesince_placeholder( $content );
 
-    if ( !$activity_ids_deleted = BP_Activity_Activity::delete_by_content( $user_id, $content, $component_name, $component_action ) )
-        return false;
-
-    do_action( 'bp_activity_delete_by_content', $user_id, $content, $component_name, $component_action );
+    if ( !$activity_ids_deleted = BP_Activity_Activity::delete_by_content( $user_id, $content, $component, $type ) )
+        return false;
+
+    do_action( 'bp_activity_delete_by_content', $user_id, $content, $component, $type );
     do_action( 'bp_activity_deleted_activities', $activity_ids_deleted );
 
@@ -629 +657 @@
 }
 
-function bp_activity_delete_for_user_by_component( $user_id, $component_name ) {
-    if ( !$activity_ids_deleted = BP_Activity_Activity::delete_for_user_by_component( $user_id, $component_name ) )
-        return false;
-
-    do_action( 'bp_activity_delete_for_user_by_component', $user_id, $component_name );
+function bp_activity_delete_for_user_by_component( $user_id, $component ) {
+    if ( !$activity_ids_deleted = BP_Activity_Activity::delete_for_user_by_component( $user_id, $component ) )
+        return false;
+
+    do_action( 'bp_activity_delete_for_user_by_component', $user_id, $component );
     do_action( 'bp_activity_deleted_activities', $activity_ids_deleted );
 
@@ -645 +673 @@
         $activity_obj = new BP_Activity_Activity( $activity_id );
 
-    if ( 'new_blog_post' == $activity_obj->component_action || 'new_blog_comment' == $activity_obj->component_action || 'new_forum_topic' == $activity_obj->component_action || 'new_forum_post' == $activity_obj->component_action )
+    if ( 'new_blog_post' == $activity_obj->type || 'new_blog_comment' == $activity_obj->type || 'new_forum_topic' == $activity_obj->type || 'new_forum_post' == $activity_obj->type )
         $link = $activity_obj->primary_link;
     else {
-        if ( 'activity_comment' == $activity_obj->component_action )
+        if ( 'activity_comment' == $activity_obj->type )
             $link = $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $activity_obj->item_id . '/';
         else
@@ -682 +710 @@
 }
 
+function bp_activity_thumbnail_images( $content ) {
+    preg_match_all( '/<img[^>]*>/Ui', $content, $matches );
+    $content = preg_replace('/<img[^>]*>/Ui', '', $content );
+
+    if ( !empty( $matches ) ) {
+        /* Get the SRC value */
+        preg_match( '/<img.*?(src\=[\'|"]{0,1}.*?[\'|"]{0,1})[\s|>]{1}/i', $matches[0][0], $src );
+
+        if ( !empty( $src ) ) {
+            $src = substr( substr( str_replace( 'src=', '', $src[1] ), 0, -1 ), 1 );
+            $pos = strpos( $content, '<blockquote>' );
+            $before = substr( $content, 0, (int) $pos );
+            $after = substr( $content, (int) $pos, strlen( $content ) );
+
+            $content = $before . '<img src="' . esc_attr( $src) . '" width="100" height="100" alt="thumb" class="align-left thumbnail" />' . $after;
+        }
+    }
+
+    return $content;
+}
+
 function bp_activity_set_action( $component_id, $key, $value ) {
     global $bp;

trunk/bp-activity/bp-activity-classes.php

@@ -7 +7 @@
     var $user_id;
     var $primary_link;
-    var $component_name;
-    var $component_action;
+    var $component;
+    var $type;
+    var $action;
+    var $content;
     var $date_recorded;
     var $hide_sitewide = false;
@@ -24 +26 @@
         global $wpdb, $bp;
 
-        $activity = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id = %d", $this->id ) );
+        $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id = %d", $this->id ) );
 
         if ( $activity ) {
-            $this->id = $activity->id;
-            $this->item_id = $activity->item_id;
-            $this->secondary_item_id = $activity->secondary_item_id;
-            $this->user_id = $activity->user_id;
-            $this->content = $activity->content;
-            $this->primary_link = $activity->primary_link;
-            $this->component_name = $activity->component_name;
-            $this->component_action = $activity->component_action;
-            $this->date_recorded = $activity->date_recorded;
-            $this->hide_sitewide = $activity->hide_sitewide;
+            $this->id = $row->id;
+            $this->item_id = $row->item_id;
+            $this->secondary_item_id = $row->secondary_item_id;
+            $this->user_id = $row->user_id;
+            $this->primary_link = $row->primary_link;
+            $this->component = $row->component;
+            $this->type = $row->type;
+            $this->action = $row->type;
+            $this->content = $row->content;
+            $this->date_recorded = $row->date_recorded;
+            $this->hide_sitewide = $row->hide_sitewide;
         }
     }
@@ -45 +48 @@
         do_action( 'bp_activity_before_save', $this );
 
-        if ( !$this->component_name || !$this->component_action )
+        if ( !$this->component || !$this->type )
             return false;
 
@@ -53 +56 @@
         /* If we have an existing ID, update the activity item, otherwise insert it. */
         if ( $this->id )
-            $q = $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET user_id = %d, component_name = %s, component_action = %s, content = %s, primary_link = %s, date_recorded = FROM_UNIXTIME(%d), item_id = %s, secondary_item_id = %s, hide_sitewide = %d WHERE id = %d", $this->user_id, $this->component_name, $this->component_action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->id );
+            $q = $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET user_id = %d, component = %s, type = %s, action = %s, content = %s, primary_link = %s, date_recorded = FROM_UNIXTIME(%d), item_id = %s, secondary_item_id = %s, hide_sitewide = %d WHERE id = %d", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->id );
         else
-            $q = $wpdb->prepare( "INSERT INTO {$bp->activity->table_name} ( user_id, component_name, component_action, content, primary_link, date_recorded, item_id, secondary_item_id, hide_sitewide ) VALUES ( %d, %s, %s, %s, %s, FROM_UNIXTIME(%d), %s, %s, %d )", $this->user_id, $this->component_name, $this->component_action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide );
+            $q = $wpdb->prepare( "INSERT INTO {$bp->activity->table_name} ( user_id, component, type, action, content, primary_link, date_recorded, item_id, secondary_item_id, hide_sitewide ) VALUES ( %d, %s, %s, %s, %s, %s, FROM_UNIXTIME(%d), %s, %s, %d )", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide );
 
         if ( !$wpdb->query( $q ) )
@@ -68 +71 @@
     /* Static Functions */
 
-    function delete( $item_id, $component_name, $component_action, $user_id = false, $secondary_item_id = false ) {
+    function delete( $item_id, $component, $type, $user_id = false, $secondary_item_id = false ) {
         global $wpdb, $bp;
 
@@ -74 +77 @@
             $secondary_sql = $wpdb->prepare( "AND secondary_item_id = %s", $secondary_item_id );
 
-        if ( $component_action )
-            $component_action_sql = $wpdb->prepare( "AND component_action = %s", $component_action );
+        if ( $type )
+            $type_sql = $wpdb->prepare( "AND type = %s", $type );
 
         if ( $user_id )
@@ -81 +84 @@
 
         /* Fetch the activity IDs so we can delete any comments for this activity item */
-        $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component_name = %s {$component_action_sql} {$user_sql}", $item_id, $component_name ) );
-
-        error_log( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component_name = %s {$component_action_sql} {$user_sql}", $item_id, $component_name ) );
-
-        if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component_name = %s {$component_action_sql} {$user_sql}", $item_id, $component_name ) ) )
+        $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component = %s {$type_sql} {$user_sql}", $item_id, $component ) );
+
+        error_log( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component = %s {$type_sql} {$user_sql}", $item_id, $component ) );
+
+        if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component = %s {$type_sql} {$user_sql}", $item_id, $component ) ) )
             return false;
 
@@ -98 +101 @@
     }
 
-    function delete_by_item_id( $item_id, $component_name, $component_action, $user_id = false, $secondary_item_id = false ) {
-        return BP_Activity_Activity::delete( $item_id, $component_name, $component_action, $user_id, $secondary_item_id );
+    function delete_by_item_id( $item_id, $component, $type, $user_id = false, $secondary_item_id = false ) {
+        return BP_Activity_Activity::delete( $item_id, $component, $type, $user_id, $secondary_item_id );
     }
 
@@ -115 +118 @@
     }
 
-    function delete_by_content( $user_id, $content, $component_name, $component_action ) {
+    function delete_by_content( $user_id, $content, $component, $type ) {
         global $bp, $wpdb;
 
         /* Fetch the activity ID so we can delete any comments for this activity item */
-        $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d AND content = %s AND component_name = %s AND component_action = %s", $user_id, $content, $component_name, $component_action ) );
-
-        if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d AND content = %s AND component_name = %s AND component_action = %s", $user_id, $content, $component_name, $component_action ) ) )
+        $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d AND content = %s AND component = %s AND type = %s", $user_id, $content, $component, $type ) );
+
+        if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d AND content = %s AND component = %s AND type = %s", $user_id, $content, $component, $type ) ) )
             return false;
 
@@ -134 +137 @@
     }
 
-    function delete_for_user_by_component( $user_id, $component_name ) {
+    function delete_for_user_by_component( $user_id, $component ) {
         global $bp, $wpdb;
 
         /* Fetch the activity IDs so we can delete any comments for this activity item */
-        $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d AND component_name = %s", $user_id, $component_name ) );
-
-        if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d AND component_name = %s", $user_id, $component_name ) ) )
+        $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d AND component = %s", $user_id, $component ) );
+
+        if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d AND component = %s", $user_id, $component ) ) )
             return false;
 
@@ -178 +181 @@
         $activity_ids = $wpdb->escape( $activity_ids );
 
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE component_action = 'activity_comment' AND item_id IN ({$activity_ids})" ) );
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE type = 'activity_comment' AND item_id IN ({$activity_ids})" ) );
     }
 
@@ -238 +241 @@
         /* Alter the query based on whether we want to show activity item comments in the stream like normal comments or threaded below the activity */
         if ( !$display_comments || 'threaded' == $display_comments ) {
-            $where_conditions[] = "a.component_action != 'activity_comment'";
+            $where_conditions[] = "a.type != 'activity_comment'";
         }
 
@@ -268 +271 @@
         $activity_ids = $wpdb->escape( $activity_ids );
 
+        if ( empty( $activity_ids ) )
+            return false;
+
         if ( $per_page && $page )
             $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
@@ -294 +300 @@
         /* Now fetch the activity comments and parse them into the correct position in the activities array. */
         foreach( $activities as $activity ) {
-            if ( 'activity_comment' != $activity->component_action && $activity->mptt_left && $activity->mptt_right )
+            if ( 'activity_comment' != $activity->type && $activity->mptt_left && $activity->mptt_right )
                 $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right );
         }
@@ -320 +326 @@
         }
 
-        $descendants = $wpdb->get_results( $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.component_action = 'activity_comment' AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ) );
+        $descendants = $wpdb->get_results( $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ) );
 
         /* Loop descendants and build an assoc array */
@@ -348 +354 @@
 
         /* Get all descendants of this node */
-        $descendants = $wpdb->get_results( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE component_action = 'activity_comment' AND secondary_item_id = %d", $parent_id ) );
+        $descendants = $wpdb->get_results( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE type = 'activity_comment' AND secondary_item_id = %d", $parent_id ) );
 
         /* Loop the descendants and recalculate the left and right values */
@@ -358 +364 @@
             $wpdb->query( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET mptt_left = %d, mptt_right = %d WHERE id = %d", $left, $right, $parent_id ) );
         else
-            $wpdb->query( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET mptt_left = %d, mptt_right = %d WHERE component_action = 'activity_comment' AND id = %d", $left, $right, $parent_id ) );
+            $wpdb->query( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET mptt_left = %d, mptt_right = %d WHERE type = 'activity_comment' AND id = %d", $left, $right, $parent_id ) );
 
         /* Return the right value of this node + 1 */
@@ -364 +370 @@
     }
 
-    function get_recorded_component_names() {
-        global $wpdb, $bp;
-
-        return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT component_name FROM {$bp->activity->table_name} ORDER BY component_name ASC" ) );
+    function get_recorded_components() {
+        global $wpdb, $bp;
+
+        return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT component FROM {$bp->activity->table_name} ORDER BY component ASC" ) );
     }
 
@@ -414 +420 @@
             $counter = 1;
             foreach( (array) $object_filter as $object ) {
-                $object_sql .= $wpdb->prepare( "a.component_name = %s", trim( $object ) );
+                $object_sql .= $wpdb->prepare( "a.component = %s", trim( $object ) );
 
                 if ( $counter != count( $object_filter ) )
@@ -432 +438 @@
             $counter = 1;
             foreach( (array) $action_filter as $action ) {
-                $action_sql .= $wpdb->prepare( "a.component_action = %s", trim( $action ) );
+                $action_sql .= $wpdb->prepare( "a.type = %s", trim( $action ) );
 
                 if ( $counter != count( $action_filter ) )

trunk/bp-activity/bp-activity-templatetags.php

@@ -266 +266 @@
     function bp_get_activity_object_name() {
         global $activities_template;
-        return apply_filters( 'bp_get_activity_object_name', $activities_template->activity->component_name );
-    }
-
-function bp_activity_action_name() {
-    echo bp_get_activity_action_name();
-}
-    function bp_get_activity_action_name() {
-        global $activities_template;
-        return apply_filters( 'bp_get_activity_action_name', $activities_template->activity->component_action );
-    }
+        return apply_filters( 'bp_get_activity_object_name', $activities_template->activity->component );
+    }
+
+function bp_activity_type() {
+    echo bp_get_activity_type();
+}
+    function bp_get_activity_type() {
+        global $activities_template;
+        return apply_filters( 'bp_get_activity_type', $activities_template->activity->type );
+    }
+    function bp_activity_action_name() { echo bp_activity_type(); }
+    function bp_get_activity_action_name() { return bp_get_activity_type(); }
 
 function bp_activity_user_id() {
@@ -310 +312 @@
 
         $object = 'user';
-        if ( $bp->groups->id == $activities_template->activity->component_name && !(int) $activities_template->activity->user_id )
+        if ( $bp->groups->id == $activities_template->activity->component && !(int) $activities_template->activity->user_id )
             $object = 'group';
-        if ( $bp->blogs->id == $activities_template->activity->component_name && !(int) $activities_template->activity->user_id )
+        if ( $bp->blogs->id == $activities_template->activity->component && !(int) $activities_template->activity->user_id )
             $object = 'blog';
 
-        $object = apply_filters( 'bp_get_activity_avatar_object_' . $activities_template->activity->component_name, $object );
+        $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. */
@@ -324 +326 @@
     }
 
+function bp_activity_action() {
+    echo bp_get_activity_action();
+}
+    function bp_get_activity_action() {
+        global $activities_template;
+
+        return apply_filters( 'bp_get_activity_action', bp_activity_content_filter( $activities_template->activity->action, $activities_template->activity->date_recorded ), $activities_template->activity->component, $activities_template->activity->type );
+    }
+
+function bp_activity_content_body() {
+    echo bp_get_activity_content_body();
+}
+    function bp_get_activity_content_body() {
+        global $activities_template;
+
+        if ( empty( $activities_template->activity->action ) )
+            $activities_template->activity->content = bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded );
+
+        return apply_filters( 'bp_get_activity_content_body', $activities_template->activity->content );
+    }
+
 function bp_activity_content() {
     echo bp_get_activity_content();
 }
     function bp_get_activity_content() {
-        global $activities_template, $allowed_tags, $bp;
-
-        if ( bp_is_home() && $activities_template->activity_type == 'personal' )
-            $content = bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name );
-        else
-            $content = bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name, true, false, false );
-
-        return apply_filters( 'bp_get_activity_content', $content, $activities_template->activity->component_name, $activities_template->activity->component_action );
-    }
-
-function bp_activity_content_filter( $content, $date_recorded, $full_name, $insert_time = true, $filter_words = true, $filter_you = true ) {
+        global $activities_template;
+
+        if ( empty( $activities_template->activity->action ) )
+            $content = bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded );
+        else {
+            $content = bp_activity_content_filter( $activities_template->activity->action, $activities_template->activity->date_recorded );
+            $content .= $activities_template->activity->content;
+        }
+
+        return apply_filters( 'bp_get_activity_content', $content, $activities_template->activity->component, $activities_template->activity->type );
+    }
+
+function bp_activity_content_filter( $content, $date_recorded ) {
     global $activities_template, $bp;
 
@@ -351 +376 @@
 
     /* Insert the time since */
-    if ( $insert_time )
-        $content[0] = bp_activity_insert_time_since( $content[0], $date_recorded );
-
-    // The "You" and "Your" conversion is only done in english, if a translation file is present
-    // then do not translate as it causes problems in other languages.
-    if ( '' == get_locale() ) {
-        /* Switch 'their/your' depending on whether the user is logged in or not and viewing their profile */
-        if ( $filter_words ) {
-            $content[0] = preg_replace( '/their\s/', 'your ', $content[0] );
-        }
-
-        /* Remove the 'You' and replace if with the persons name */
-        if ( $filter_you && $full_name != '' ) {
-            $content[0] = preg_replace( "/{$full_name}[<]/", 'You<', $content[0], 1 );
-        }
-    }
+    $content[0] = bp_activity_insert_time_since( $content[0], $date_recorded );
 
     /* Add the permalink */
@@ -559 +569 @@
 
         $class = '';
-        if ( in_array( $activities_template->activity->component_action, (array)$mini_activity_actions ) )
+        if ( in_array( $activities_template->activity->type, (array)$mini_activity_actions ) )
             $class = ' mini';
 
@@ -565 +575 @@
             $class .= ' has-comments';
 
-        return apply_filters( 'bp_get_activity_css_class', $activities_template->activity->component_name . ' ' . $activities_template->activity->component_action . $class );
+        return apply_filters( 'bp_get_activity_css_class', $activities_template->activity->component . ' ' . $activities_template->activity->type . $class );
     }
 
@@ -609 +619 @@
 
         /* Fetch the names of components that have activity recorded in the DB */
-        $component_names = BP_Activity_Activity::get_recorded_component_names();
-
-        if ( !$component_names )
+        $components = BP_Activity_Activity::get_recorded_components();
+
+        if ( !$components )
             return false;
 
-        foreach ( (array) $component_names as $component_name ) {
+        foreach ( (array) $components as $component ) {
             /* Skip the activity comment filter */
-            if ( 'activity' == $component_name )
+            if ( 'activity' == $component )
                 continue;
 
-            if ( isset( $_GET['afilter'] ) && $component_name == $_GET['afilter'] )
+            if ( isset( $_GET['afilter'] ) && $component == $_GET['afilter'] )
                 $selected = ' class="selected"';
             else
                 unset($selected);
 
-            $component_name = attribute_escape( $component_name );
+            $component = attribute_escape( $component );
 
             switch ( $style ) {
                 case 'list':
                     $tag = 'li';
-                    $before = '<li id="afilter-' . $component_name . '"' . $selected . '>';
+                    $before = '<li id="afilter-' . $component . '"' . $selected . '>';
                     $after = '</li>';
                 break;
                 case 'paragraph':
                     $tag = 'p';
-                    $before = '<p id="afilter-' . $component_name . '"' . $selected . '>';
+                    $before = '<p id="afilter-' . $component . '"' . $selected . '>';
                     $after = '</p>';
                 break;
                 case 'span':
                     $tag = 'span';
-                    $before = '<span id="afilter-' . $component_name . '"' . $selected . '>';
+                    $before = '<span id="afilter-' . $component . '"' . $selected . '>';
                     $after = '</span>';
                 break;
             }
 
-            $link = add_query_arg( 'afilter', $component_name );
+            $link = add_query_arg( 'afilter', $component );
             $link = remove_query_arg( 'acpage' , $link );
 
-            $link = apply_filters( 'bp_get_activity_filter_link_href', $link, $component_name );
+            $link = apply_filters( 'bp_get_activity_filter_link_href', $link, $component );
 
             /* Make sure all core internal component names are translatable */
-            $translatable_component_names = array( __( 'profile', 'buddypress'), __( 'friends', 'buddypress' ), __( 'groups', 'buddypress' ), __( 'status', 'buddypress' ), __( 'blogs', 'buddypress' ) );
-
-            $component_links[] = $before . '<a href="' . attribute_escape( $link ) . '">' . ucwords( __( $component_name, 'buddypress' ) ) . '</a>' . $after;
+            $translatable_components = array( __( 'profile', 'buddypress'), __( 'friends', 'buddypress' ), __( 'groups', 'buddypress' ), __( 'status', 'buddypress' ), __( 'blogs', 'buddypress' ) );
+
+            $component_links[] = $before . '<a href="' . attribute_escape( $link ) . '">' . ucwords( __( $component, 'buddypress' ) ) . '</a>' . $after;
         }
 
@@ -745 +755 @@
         global $activities_template;
 
-        $content = explode( '<span', $activities_template->activity->content );
+        if ( !empty( $activities_template->activity->action ) )
+            $content = $activities_template->activity->action;
+        else
+            $content = $activities_template->activity->content;
+
+        $content = explode( '<span', $content );
         $title = trim( strip_tags( html_entity_decode( $content[0] ) ) );
 
@@ -751 +766 @@
             $title = substr( $title, 0, -1 );
 
-        if ( 'activity_update' == $activities_template->activity->component_action ) {
+        if ( 'activity_update' == $activities_template->activity->type ) {
             $content = explode( '<div class="activity-inner">', $activities_template->activity->content );
             $title .= ': ' . strip_tags( bp_create_excerpt( $content[1], 15 ));
@@ -783 +798 @@
         global $activities_template;
 
-        return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $activities_template->activity->content ), ENT_COMPAT, 'UTF-8' ) );
+        if ( empty( $activities_template->activity->action ) )
+            $content = $activities_template->activity->content;
+        else
+            $content = $activities_template->activity->action . $activities_template->activity->content;
+
+        return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $content ), ENT_COMPAT, 'UTF-8' ) );
     }
 

trunk/bp-blogs.php

@@ -246 +246 @@
     $defaults = array(
         'user_id' => $bp->loggedin_user->id,
-        'content' => false,
-        'primary_link' => false,
-        'component_name' => $bp->blogs->id,
-        'component_action' => false,
+        'action' => '',
+        'content' => '',
+        'primary_link' => '',
+        'component' => $bp->blogs->id,
+        'type' => false,
         'item_id' => false,
         'secondary_item_id' => false,
@@ -259 +260 @@
     extract( $r, EXTR_SKIP );
 
-    return bp_activity_add( array( 'user_id' => $user_id, 'content' => $content, 'primary_link' => $primary_link, 'component_name' => $component_name, 'component_action' => $component_action, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+    return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
 }
 
@@ -268 +269 @@
         $defaults = array(
             'item_id' => false,
-            'component_name' => $bp->blogs->id,
-            'component_action' => false,
+            'component' => $bp->blogs->id,
+            'type' => false,
             'user_id' => false,
             'secondary_item_id' => false
@@ -279 +280 @@
         bp_activity_delete_by_item_id( array(
             'item_id' => $item_id,
-            'component_name' => $component_name,
-            'component_action' => $component_action,
+            'component' => $component,
+            'type' => $type,
             'user_id' => $user_id,
             'secondary_item_id' => $secondary_item_id
@@ -341 +342 @@
         bp_blogs_record_activity( array(
             'user_id' => $recorded_blog->user_id,
-            'content' => apply_filters( 'bp_blogs_activity_created_blog', sprintf( __( '%s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_blog_option( $recorded_blog->blog_id, 'siteurl' ) . '">' . attribute_escape( $name ) . '</a>' ), &$recorded_blog, $name, $description ),
+            'action' => apply_filters( 'bp_blogs_activity_created_blog_action', sprintf( __( '%s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_blog_option( $recorded_blog->blog_id, 'siteurl' ) . '">' . attribute_escape( $name ) . '</a>' ), &$recorded_blog, $name, $description ),
             'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', get_blog_option( $recorded_blog->blog_id, 'siteurl' ), $recorded_blog->blog_id ),
-            'component_action' => 'new_blog',
+            'type' => 'new_blog',
             'item_id' => $recorded_blog->blog_id
         ) );
@@ -389 +390 @@
                 $post_permalink = bp_post_get_permalink( $post, $blog_id );
 
-                $activity_content = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
-                $activity_content .= "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
+                $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
+                $activity_content = "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
 
                 bp_blogs_record_activity( array(
                     'user_id' => (int)$post->post_author,
-                    'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ),
+                    'action' => apply_filters( 'bp_blogs_activity_new_post_action', $activity_action, &$post, $post_permalink ),
+                    'content' => apply_filters( 'bp_blogs_activity_new_post_content', $activity_content, &$post, $post_permalink ),
                     'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
-                    'component_action' => 'new_blog_post',
+                    'type' => 'new_blog_post',
                     'item_id' => $blog_id,
                     'secondary_item_id' => $post_id,
@@ -407 +409 @@
 
         /* Delete and the activity stream item as we are probably going to re-add it later with new info. */
-        bp_blogs_delete_activity( array( 'item_id' => $existing_post->id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_post' ) );
+        bp_blogs_delete_activity( array( 'item_id' => $existing_post->id, 'component' => $bp->blogs->slug, 'type' => 'new_blog_post' ) );
 
         /* Delete the recorded post if the status is not published or it is password protected */
@@ -426 +428 @@
             $post_permalink = bp_post_get_permalink( $post, $blog_id );
 
-            $activity_content = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
-            $activity_content .= "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
+            $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
+            $activity_content = "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
 
             /* Record this in activity streams */
             bp_blogs_record_activity( array(
                 'user_id' => (int)$post->post_author,
-                'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ),
+                'action' => apply_filters( 'bp_blogs_activity_new_post_action', $activity_action, &$post, $post_permalink ),
+                'content' => apply_filters( 'bp_blogs_activity_new_post_content', $activity_content, &$post, $post_permalink ),
                 'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
-                'component_action' => 'new_blog_post',
+                'type' => 'new_blog_post',
                 'item_id' => $blog_id,
                 'secondary_item_id' => $existing_post->id,
@@ -483 +486 @@
         /* Record in activity streams */
         $comment_link = bp_post_get_permalink( $comment->post, $wpdb->blogid ) . '#comment-' . $comment_id;
-        $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
-        $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
+        $activity_action = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
+        $activity_content = '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
 
         /* Record this in activity streams */
         bp_blogs_record_activity( array(
             'user_id' => $user_id,
-            'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ),
+            'action' => apply_filters( 'bp_blogs_activity_new_comment_action', $activity_action, &$comment, &$recorded_comment, $comment_link ),
+            'content' => apply_filters( 'bp_blogs_activity_new_comment_content', $activity_content, &$comment, &$recorded_comment, $comment_link ),
             'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
-            'component_action' => 'new_blog_comment',
+            'type' => 'new_blog_comment',
             'item_id' => $wpdb->blogid,
             'secondary_item_id' => $comment_id,
@@ -530 +534 @@
 
     // Delete activity stream item
-    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog' ) );
+    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component' => $bp->blogs->slug, 'type' => 'new_blog' ) );
 
     do_action( 'bp_blogs_remove_blog', $blog_id );
@@ -545 +549 @@
 
     // Delete activity stream item
-    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog' ) );
+    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component' => $bp->blogs->slug, 'type' => 'new_blog' ) );
 
     do_action( 'bp_blogs_remove_blog_for_user', $blog_id, $user_id );
@@ -566 +570 @@
 
     // Delete activity stream item
-    bp_blogs_delete_activity( array( 'item_id' => $wpdb->blogid, 'component_name' => $existing_post->id, 'component_action' => 'new_blog_post' ) );
+    bp_blogs_delete_activity( array( 'item_id' => $wpdb->blogid, 'component' => $existing_post->id, 'type' => 'new_blog_post' ) );
 
     do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $post->user_id );
@@ -579 +583 @@
 
     // Delete activity stream item
-    bp_blogs_delete_activity( array( 'item_id' => $wpdb->blogid, 'secondary_item_id' => $comment_id, 'component_action' => 'new_blog_comment' ) );
+    bp_blogs_delete_activity( array( 'item_id' => $wpdb->blogid, 'secondary_item_id' => $comment_id, 'type' => 'new_blog_comment' ) );
 
     do_action( 'bp_blogs_remove_comment', $blog_id, $comment_id, $bp->loggedin_user->id );
@@ -608 +612 @@
 
     // Delete activity stream item
-    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => false ) );
+    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component' => $bp->blogs->slug, 'type' => false ) );
 
     do_action( 'bp_blogs_remove_data_for_blog', $blog_id );

trunk/bp-core.php

@@ -246 +246 @@
 
     /* Add names of root components to the banned blog list to avoid conflicts */
-    bp_core_add_illegal_names();
+    if ( bp_core_is_multisite() )
+        bp_core_add_illegal_names();
 
     update_site_option( 'bp-core-db-version', BP_CORE_DB_VERSION );

trunk/bp-core/bp-core-activation.php

@@ -55 +55 @@
             bp_activity_add( array(
                 'user_id' => $signup['user_id'],
-                'content' => apply_filters( 'bp_core_activity_registered_member', sprintf( __( '%s became a registered member', 'buddypress' ), $userlink ), $signup['user_id'] ),
-                'primary_link' => apply_filters( 'bp_core_actiivty_registered_member_primary_link', $userlink ),
-                'component_name' => 'profile',
-                'component_action' => 'new_member'
+                'action' => apply_filters( 'bp_core_activity_registered_member_action', sprintf( __( '%s became a registered member', 'buddypress' ), $userlink ), $signup['user_id'] ),
+                'component' => 'profile',
+                'type' => 'new_member'
             ) );
         }

trunk/bp-friends.php

@@ -269 +269 @@
     $defaults = array(
         'user_id' => $bp->loggedin_user->id,
-        'content' => false,
-        'primary_link' => false,
-        'component_name' => $bp->friends->id,
-        'component_action' => false,
+        'action' => '',
+        'content' => '',
+        'primary_link' => '',
+        'component' => $bp->friends->id,
+        'type' => false,
         'item_id' => false,
         'secondary_item_id' => false,
@@ -282 +283 @@
     extract( $r, EXTR_SKIP );
 
-    return bp_activity_add( array( 'user_id' => $user_id, 'content' => $content, 'primary_link' => $primary_link, 'component_name' => $component_name, 'component_action' => $component_action, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+    return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
 }
 
@@ -288 +289 @@
     if ( function_exists('bp_activity_delete_by_item_id') ) {
         extract( (array)$args );
-        bp_activity_delete_by_item_id( array( 'item_id' => $item_id, 'component_name' => $bp->friends->id, 'component_action' => $component_action, 'user_id' => $user_id, 'secondary_item_id' => $secondary_item_id ) );
+        bp_activity_delete_by_item_id( array( 'item_id' => $item_id, 'component' => $bp->friends->id, 'type' => $type, 'user_id' => $user_id, 'secondary_item_id' => $secondary_item_id ) );
     }
 }
@@ -389 +390 @@
 
     // Remove the activity stream item for the user who canceled the friendship
-    friends_delete_activity( array( 'item_id' => $friendship_id, 'component_action' => 'friendship_accepted', 'user_id' => $bp->displayed_user->id ) );
+    friends_delete_activity( array( 'item_id' => $friendship_id, 'type' => 'friendship_accepted', 'user_id' => $bp->displayed_user->id ) );
 
     do_action( 'friends_friendship_deleted', $friendship_id, $initiator_userid, $friend_userid );
@@ -418 +419 @@
         $initiator_link = bp_core_get_userlink( $friendship->initiator_user_id );
         $friend_link = bp_core_get_userlink( $friendship->friend_user_id );
-
-        $primary_link = apply_filters( 'friends_activity_friendship_accepted_primary_link', bp_core_get_user_domain( $friendship->initiator_user_id ), &$friendship );
 
         /* Record in activity streams for the initiator */
         friends_record_activity( array(
             'user_id' => $friendship->initiator_user_id,
-            'component_action' => 'friendship_created',
-            'content' => apply_filters( 'friends_activity_friendship_accepted', sprintf( __( '%s and %s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ),
-            'primary_link' => $primary_link,
+            'type' => 'friendship_created',
+            'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%s and %s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ),
             'item_id' => $friendship_id
         ) );
@@ -433 +431 @@
         friends_record_activity( array(
             'user_id' => $friendship->friend_user_id,
-            'component_action' => 'friendship_created',
-            'content' => apply_filters( 'friends_activity_friendship_accepted', sprintf( __( '%s and %s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ),
-            'primary_link' => $primary_link,
+            'type' => 'friendship_created',
+            'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%s and %s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ),
             'item_id' => $friendship_id,
             'hide_sitewide' => true /* We've already got the first entry site wide */

trunk/bp-groups.php

@@ -306 +306 @@
 
             groups_record_activity( array(
-                'content' => apply_filters( 'groups_activity_accepted_invite', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $bp->loggedin_user->id, &$group ),
-                'primary_link' => apply_filters( 'groups_activity_accepted_invite_primary_link', bp_get_group_permalink( $group ), &$group ),
-                'component_action' => 'joined_group',
+                'action' => apply_filters( 'groups_activity_accepted_invite_action', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $bp->loggedin_user->id, &$group ),
+                'type' => 'joined_group',
                 'item_id' => $group->id
             ) );
@@ -1155 +1154 @@
             /* Once we compelete all steps, record the group creation in the activity stream. */
             groups_record_activity( array(
-                'content' => apply_filters( 'groups_activity_created_group', sprintf( __( '%s created the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ),
-                'primary_link' => apply_filters( 'groups_activity_created_group_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
-                'component_action' => 'created_group',
+                'action' => apply_filters( 'groups_activity_created_group_action', sprintf( __( '%s created the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ),
+                'type' => 'created_group',
                 'item_id' => $bp->groups->new_group_id
             ) );
@@ -1321 +1319 @@
     $defaults = array(
         'user_id' => $bp->loggedin_user->id,
-        'content' => false,
-        'primary_link' => false,
-        'component_name' => $bp->groups->id,
-        'component_action' => false,
+        'action' => '',
+        'content' => '',
+        'primary_link' => '',
+        'component' => $bp->groups->id,
+        'type' => false,
         'item_id' => false,
         'secondary_item_id' => false,
@@ -1334 +1333 @@
     extract( $r, EXTR_SKIP );
 
-    return bp_activity_add( array( 'user_id' => $user_id, 'content' => $content, 'primary_link' => $primary_link, 'component_name' => $component_name, 'component_action' => $component_action, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+    return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
 }
 
@@ -1602 +1601 @@
     /* Delete all group activity from activity streams */
     if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
-        bp_activity_delete_by_item_id( array( 'item_id' => $group_id, 'component_name' => $bp->groups->id ) );
+        bp_activity_delete_by_item_id( array( 'item_id' => $group_id, 'component' => $bp->groups->id ) );
     }
 
@@ -1702 +1701 @@
     /* Record this in activity streams */
     groups_record_activity( array(
-        'content' => apply_filters( 'groups_activity_joined_group', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ),
-        'primary_link' => apply_filters( 'groups_activity_joined_group_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
-        'component_action' => 'joined_group',
+        'action' => apply_filters( 'groups_activity_joined_group', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ),
+        'type' => 'joined_group',
         'item_id' => $group_id
     ) );
@@ -1894 +1892 @@
 
     /* Record this in activity streams */
-    $activity_content = sprintf( __( '%s posted an update in the group %s:', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
-    $activity_content .= '<div class="activity-inner">' . $content . '</div>';
+    $activity_action = sprintf( __( '%s posted an update in the group %s:', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
+    $activity_content = '<div class="activity-inner">' . $content . '</div>';
 
     $activity_id = groups_record_activity( array(
         'user_id' => $user_id,
+        'action' => apply_filters( 'groups_activity_new_update_action', $activity_action ),
         'content' => apply_filters( 'groups_activity_new_update_content', $activity_content ),
-        'primary_link' => apply_filters( 'groups_activity_new_update_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
-        'component_action' => 'activity_update',
+        'type' => 'activity_update',
         'item_id' => $bp->groups->current_group->id
     ) );
@@ -1941 +1939 @@
         $topic = bp_forums_get_topic_details( $topic_id );
 
-        $activity_content = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
-        $activity_content .= '<blockquote>' . bp_create_excerpt( $post_text ) . '</blockquote>';
+        $activity_action = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
+        $activity_content = '<blockquote>' . bp_create_excerpt( $post_text ) . '</blockquote>';
 
         /* Record this in activity streams */
         groups_record_activity( array(
-            'content' => apply_filters( 'groups_activity_new_forum_post', $activity_content, $post_text, &$topic, &$forum_post ),
+            'action' => apply_filters( 'groups_activity_new_forum_post_action', $activity_action, $post_text, &$topic, &$forum_post ),
+            'content' => apply_filters( 'groups_activity_new_forum_post_content', $activity_content, $post_text, &$topic, &$forum_post ),
             'primary_link' => apply_filters( 'groups_activity_new_forum_post_primary_link', bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/' ),
-            'component_action' => 'new_forum_post',
+            'type' => 'new_forum_post',
             'item_id' => $bp->groups->current_group->id,
             'secondary_item_id' => $forum_post
@@ -1975 +1974 @@
         $topic = bp_forums_get_topic_details( $topic_id );
 
-        $activity_content = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
-        $activity_content .= '<blockquote>' . bp_create_excerpt( $topic_text ) . '</blockquote>';
+        $activity_action = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
+        $activity_content = '<blockquote>' . bp_create_excerpt( $topic_text ) . '</blockquote>';
 
         /* Record this in activity streams */
         groups_record_activity( array(
-            'content' => apply_filters( 'groups_activity_new_forum_topic', $activity_content, $topic_text, &$topic ),
+            'action' => apply_filters( 'groups_activity_new_forum_topic_action', $activity_action, $topic_text, &$topic ),
+            'content' => apply_filters( 'groups_activity_new_forum_topic_content', $activity_content, $topic_text, &$topic ),
             'primary_link' => apply_filters( 'groups_activity_new_forum_topic_primary_link', bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/' ),
-            'component_action' => 'new_forum_topic',
+            'type' => 'new_forum_topic',
             'item_id' => $bp->groups->current_group->id,
             'secondary_item_id' => $topic->topic_id
@@ -2004 +2004 @@
         /* Update the activity stream item */
         if ( function_exists( 'bp_activity_delete_by_item_id' ) )
-            bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component_name' => $bp->groups->id, 'component_action' => 'new_forum_topic' ) );
-
-        $activity_content = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
-        $activity_content .= '<blockquote>' . bp_create_excerpt( $topic_text ) . '</blockquote>';
+            bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_topic' ) );
+
+        $activity_action = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
+        $activity_content = '<blockquote>' . bp_create_excerpt( $topic_text ) . '</blockquote>';
 
         /* Record this in activity streams */
         groups_record_activity( array(
-            'content' => apply_filters( 'groups_activity_new_forum_topic', $activity_content, $topic_text, &$topic ),
+            'action' => apply_filters( 'groups_activity_new_forum_topic_action', $activity_action, $topic_text, &$topic ),
+            'content' => apply_filters( 'groups_activity_new_forum_topic_content', $activity_content, $topic_text, &$topic ),
             'primary_link' => apply_filters( 'groups_activity_new_forum_topic_primary_link', bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/' ),
-            'component_action' => 'new_forum_topic',
+            'type' => 'new_forum_topic',
             'item_id' => (int)$bp->groups->current_group->id,
             'user_id' => (int)$topic->topic_poster,
@@ -2041 +2042 @@
         /* Update the activity stream item */
         if ( function_exists( 'bp_activity_delete_by_item_id' ) )
-            bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $post_id, 'component_name' => $bp->groups->id, 'component_action' => 'new_forum_post' ) );
-
-        $activity_content = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $post->poster_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
-        $activity_content .= '<blockquote>' . bp_create_excerpt( $post_text ) . '</blockquote>';
+            bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $post_id, 'component' => $bp->groups->id, 'type' => 'new_forum_post' ) );
+
+        $activity_action = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $post->poster_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
+        $activity_content = '<blockquote>' . bp_create_excerpt( $post_text ) . '</blockquote>';
 
         /* Record this in activity streams */
         groups_record_activity( array(
-            'content' => apply_filters( 'groups_activity_new_forum_post', $activity_content, $post_text, &$topic, &$forum_post ),
+            'action' => apply_filters( 'groups_activity_new_forum_post_action', $activity_action, $post_text, &$topic, &$forum_post ),
+            'content' => apply_filters( 'groups_activity_new_forum_post_content', $activity_content, $post_text, &$topic, &$forum_post ),
             'primary_link' => apply_filters( 'groups_activity_new_forum_post_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
-            'component_action' => 'new_forum_post',
+            'type' => 'new_forum_post',
             'item_id' => (int)$bp->groups->current_group->id,
             'user_id' => (int)$post->poster_id,
@@ -2071 +2073 @@
         /* Delete the activity stream item */
         if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
-            bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => $bp->groups->id, 'component_action' => 'new_forum_topic' ) );
-            bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => $bp->groups->id, 'component_action' => 'new_forum_post' ) );
+            bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_topic' ) );
+            bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_post' ) );
         }
 
@@ -2089 +2091 @@
         /* Delete the activity stream item */
         if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
-            bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $post_id, 'component_name' => $bp->groups->id, 'component_action' => 'new_forum_post' ) );
+            bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $post_id, 'component' => $bp->groups->id, 'type' => 'new_forum_post' ) );
         }
 
@@ -2344 +2346 @@
 
     groups_record_activity( array(
-        'content' => apply_filters( 'groups_activity_membership_accepted', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $user_id, &$group ),
-        'primary_link' => apply_filters( 'groups_activity_membership_accepted_primary_link', bp_get_group_permalink( $group ), &$group ),
-        'component_action' => 'joined_group',
+        'action' => apply_filters( 'groups_activity_membership_accepted_action', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $user_id, &$group ),
+        'type' => 'joined_group',
         'item_id' => $group->id,
         'user_id' => $user_id

trunk/bp-themes/bp-default/_inc/css/default.css

@@ -1483 +1483 @@
 div.post {
     margin: 0 0 60px 0;
+    overflow: auto;
 }
     div.post div.author-box, div.comment-avatar-box {
@@ -1507 +1508 @@
         font-size: 26px;
         margin-bottom: 5px;
+        margin-top: 0;
         line-height: 120%;
     }
@@ -1526 +1528 @@
     div.post p.postmetadata {
         margin-top: 15px;
+        clear: left;
         overflow: hidden;
     }

trunk/bp-themes/bp-default/_inc/global.js

@@ -287 +287 @@
             /* Update the feed link */
             if ( null != response.feed_url )
-                j('div#subnav li.feed a').attr('href', response.feed_url);
+                j('.directory div#subnav li.feed a').attr('href', response.feed_url);
 
             j('div.item-list-tabs li.selected').removeClass('loading');

trunk/bp-themes/bp-default/activity/entry.php

@@ -30 +30 @@
     </div>
 
-    <?php if ( 'activity_comment' == bp_get_activity_action_name() ) : ?>
+    <?php if ( 'activity_comment' == bp_get_activity_type() ) : ?>
         <div class="activity-inreplyto">
             <strong><?php _e( 'In reply to', 'buddypress' ) ?></strong> - <?php bp_activity_parent_content() ?> &middot;

trunk/bp-themes/bp-default/activity/index.php

@@ -72 +72 @@
                     // If you're concerned about no-script functionality, uncomment the following line.
 
-                    // locate_template( array( 'activity/activity-loop.php' ), true );
+                    //locate_template( array( 'activity/activity-loop.php' ), true );
                 ?>
             </div><!-- .activity -->

trunk/bp-themes/bp-sn-parent/_inc/ajax.php

@@ -449 +449 @@
             'content' => apply_filters( 'xprofile_activity_update', $activity_content, &$wire_post ),
             'primary_link' => apply_filters( 'xprofile_activity_update_primary_link', $primary_link ),
-            'component_action' => 'activity_update'
+            'type' => 'activity_update'
         ) );
 
@@ -464 +464 @@
             'content' => apply_filters( 'groups_activity_update', $activity_content ),
             'primary_link' => apply_filters( 'groups_activity_update_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
-            'component_action' => 'activity_update',
+            'type' => 'activity_update',
             'item_id' => $item_id
         ) );
@@ -512 +512 @@
         'content' => apply_filters( 'bp_activity_comment_content', $comment_header . '<div class="activity-inner">' . $_POST['content'] . '</div>' ),
         'primary_link' => '',
-        'component_name' => $bp->activity->id,
-        'component_action' => 'activity_comment',
+        'component' => $bp->activity->id,
+        'type' => 'activity_comment',
         'user_id' => $bp->loggedin_user->id,
         'item_id' => $_POST['form_id'],

trunk/bp-xprofile.php

@@ -484 +484 @@
     $defaults = array(
         'user_id' => $bp->loggedin_user->id,
-        'content' => false,
-        'primary_link' => false,
-        'component_name' => $bp->profile->id,
-        'component_action' => false,
+        'action' => '',
+        'content' => '',
+        'primary_link' => '',
+        'component' => $bp->profile->id,
+        'type' => false,
         'item_id' => false,
         'secondary_item_id' => false,
@@ -497 +498 @@
     extract( $r, EXTR_SKIP );
 
-    return bp_activity_add( array( 'user_id' => $user_id, 'content' => $content, 'primary_link' => $primary_link, 'component_name' => $component_name, 'component_action' => $component_action, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+    return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
 }
 
@@ -516 +517 @@
     if ( function_exists('bp_activity_delete_by_item_id') ) {
         extract($args);
-        bp_activity_delete_by_item_id( array( 'item_id' => $item_id, 'component_name' => $bp->profile->id, 'component_action' => $component_action, 'user_id' => $user_id, 'secondary_item_id' => $secondary_item_id ) );
+        bp_activity_delete_by_item_id( array( 'item_id' => $item_id, 'component' => $bp->profile->id, 'type' => $type, 'user_id' => $user_id, 'secondary_item_id' => $secondary_item_id ) );
     }
 }