Changeset 3640 for trunk/bp-blogs.php

Timestamp:

01/01/2011 08:06:28 PM (16 years ago)

Author:

boonebgorges

Message:

Adds the original blog name to the activity action for new blog post/comment activity items on MS. Fixes #2028. Props sorich87

File:

• trunk/bp-blogs.php (modified) (6 diffs)

trunk/bp-blogs.php

@@ -357 +357 @@
 
         // This is to stop infinite loops with Donncha's sitewide tags plugin
-        if ( (int)$blog_id == (int)$bp->site_options['tags_blog_id'] )
+        if ( !empty( $bp->site_options['tags_blog_id'] ) && (int)$blog_id == (int)$bp->site_options['tags_blog_id'] )
                 return false;
 
@@ -368 +368 @@
                         // Record this in activity streams
                         $post_permalink   = get_permalink( $post_id );
-                        $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>' );
+                        
+                        if ( is_multisite() ) {
+                                $activity_action  = sprintf( __( '%s wrote a new blog post: %s on the blog %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>' );
+                        } else {
+                                $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 = $post->post_content;
 
@@ -386 +392 @@
                 bp_blogs_update_blogmeta( $blog_id, 'last_activity', bp_core_current_time() );
         } else {
-                bp_blogs_remove_post( $post_id, $blog_id );
+                bp_blogs_remove_post( $post_id, $blog_id, $user_id );
         }
 
@@ -443 +449 @@
 
                 // 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() ) {
+                        $activity_action        = sprintf( __( '%s commented on the blog post %s on the blog %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
+                } else {
+                        $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>' );
+                }
+                
                 $activity_content       = $recorded_comment->comment_content;
-
+                
                 // Record in activity streams
                 bp_blogs_record_activity( array(
@@ -538 +549 @@
 add_action( 'remove_user_from_blog', 'bp_blogs_remove_blog_for_user', 10, 2 );
 
-function bp_blogs_remove_post( $post_id, $blog_id = false ) {
+function bp_blogs_remove_post( $post_id, $blog_id = false, $user_id = false ) {
         global $current_blog, $bp;
 
@@ -546 +557 @@
                 $blog_id = (int)$current_blog->blog_id;
 
+        if ( !$user_id )
+                $user_id = $bp->loggedin_user->id;
+
         // Delete activity stream item
         bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'secondary_item_id' => $post_id, 'component' => $bp->blogs->slug, 'type' => 'new_blog_post' ) );
 
-        do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $post->user_id );
+        do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $user_id );
 }
 add_action( 'delete_post', 'bp_blogs_remove_post' );