Ticket #3460: cpt-added-to-bp-activity.diff

bp-blogs/bp-blogs-functions.php

@@ -236 +236 @@
         if ( (int) $blog_id == $tags_blog_id && apply_filters( 'bp_blogs_block_sitewide_tags_activity', true ) )
                 return false;
 
-        // Don't record this if it's not a post
-        if ( !in_array( $post->post_type, apply_filters( 'bp_blogs_record_post_post_types', array( 'post' ) ) ) )
+        //Block all WordPress default post types with the exception of 'post'.  
+        if ( in_array( $post->post_type, apply_filters( 'bp_blogs_block_wp_default_post_types', array( 'page', 'revision', 'nav_menu_item', 'attachment' ) ) ) )
                 return false;
 
         $is_blog_public = apply_filters( 'bp_is_blog_public', (int)get_blog_option( $blog_id, 'blog_public' ) );
@@ -246 +246 @@
                 if ( $is_blog_public || !is_multisite() ) {
 
                         // Record this in activity streams
-                        $post_permalink   = get_permalink( $post_id );
+                        $post_permalink = get_permalink( $post_id );
 
+                        //Define a $post_type for our purposes
+                        $post_type = get_post_type_object( $post->post_type );
+
+                        // Add a new string to $activity_action to grab the post_type label
                         if ( is_multisite() )
-                                $activity_action  = sprintf( __( '%1$s wrote a new post, %2$s, on the site %3$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
+                                $activity_action  = sprintf( __( '%1$s wrote a new %4$s %2$s, on the site %3$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>', '<span class="' . lcfirst($post_type->labels->singular_name) . '">' . $post_type->labels->singular_name . '</span>' );
+
                         else
-                                $activity_action  = sprintf( __( '%1$s wrote a new post, %2$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
+                                 $activity_action  = sprintf( __( '%1$s wrote a new %2$s, %3$s', 'buddypress' ), bp_core_get_userlink( (int) $post->post_author ), '<span class="' . lcfirst($post_type->labels->singular_name) . '">' . $post_type->labels->singular_name . '</span>', '<a href="' . $post_permalink . '">' . $post->post_title . '</a>');
 
                         // Make sure there's not an existing entry for this post (prevent bumping)
                         if ( bp_is_active( 'activity' ) ) {
@@ -743 +748 @@
 }
 add_action( 'wpmu_delete_user',  'bp_blogs_remove_data' );
 add_action( 'delete_user',       'bp_blogs_remove_data' );
-add_action( 'bp_make_spam_user', 'bp_blogs_remove_data' );
+add_action( 'bp_make_spam_user', 'bp_blogs_remove_data' );
+ No newline at end of file