Ticket #2028: 2028.diff

bp-blogs.php

@@ -435 +435 @@
                 $comment_link   = htmlspecialchars( get_comment_link( $recorded_comment->comment_ID ) );
 
                 // Prepare to record in activity streams
-                $activity_action        = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>' );
+                if ( is_multisite() )
+                        $blog_link = sprintf( __( ' on the blog %s', 'buddypress' ), '<a href="' . get_blog_option( $recorded_comment->blog_id, 'home' ) . '">' . get_blog_option( $recorded_comment->blog_id, 'blogname' ) . '</a>' );
+                else
+                        $blog_link = '';
+
+                $activity_action = sprintf( __( '%1$s commented on the blog post %2$s%3$s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>', $blog_link );
+
                 $activity_content       = $recorded_comment->comment_content;
 
                 // Record in activity streams
@@ -475 +481 @@
 
         if ( empty( $role ) ) {
                 $key = $wpdb->get_blog_prefix( $id ). 'capabilities';
-                
+
                 $roles = get_user_meta( $user_id, $key, true );
-                
+
                 if ( is_array( $roles ) )
                         $role = array_search( 1, $roles );
                 else
@@ -764 +770 @@
 add_action( 'bp_blogs_new_blog', 'bp_core_clear_cache' );
 add_action( 'bp_blogs_remove_data', 'bp_core_clear_cache' );
 
-?>
- No newline at end of file
+?>