Changeset 2252

Timestamp:

01/04/2010 09:36:09 AM (15 years ago)

Author:

apeatling

Message:

Fixes #1539 - missing primary blog activity.

File:

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

trunk/bp-blogs.php

@@ -361 +361 @@
         if ( 'publish' == $post->post_status && '' == $post->post_password ) {
 
-            $recorded_post = new BP_Blogs_Post;
-            $recorded_post->user_id = $user_id;
-            $recorded_post->blog_id = $blog_id;
-            $recorded_post->post_id = $post_id;
-            $recorded_post->date_created = strtotime( $post->post_date );
-
-            $recorded_post_id = $recorded_post->save();
-
-            bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
+            /* If we're on a multiblog install, record this post */
+            if ( bp_core_is_multiblog_install() ) {
+                $recorded_post = new BP_Blogs_Post;
+                $recorded_post->user_id = $user_id;
+                $recorded_post->blog_id = $blog_id;
+                $recorded_post->post_id = $post_id;
+                $recorded_post->date_created = strtotime( $post->post_date );
+
+                $recorded_post_id = $recorded_post->save();
+
+                bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
+            }
 
             if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
@@ -383 +386 @@
                     'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
                     'component_action' => 'new_blog_post',
-                    'item_id' => $recorded_post_id,
+                    'item_id' => $blog_id,
+                    'secondary_item_id' => $post_id,
                     'recorded_time' => strtotime( $post->post_date )
                 ));
@@ -450 +454 @@
         return false;
 
-    $recorded_comment = new BP_Blogs_Comment;
-    $recorded_comment->user_id = $user_id;
-    $recorded_comment->blog_id = $wpdb->blogid;
-    $recorded_comment->comment_id = $comment_id;
-    $recorded_comment->comment_post_id = $comment->comment_post_ID;
-    $recorded_comment->date_created = strtotime( $comment->comment_date );
-
-    $recorded_commment_id = $recorded_comment->save();
-
-    bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', time() );
+    /* If we're on a multiblog install, record this post */
+    if ( bp_core_is_multiblog_install() ) {
+        $recorded_comment = new BP_Blogs_Comment;
+        $recorded_comment->user_id = $user_id;
+        $recorded_comment->blog_id = $wpdb->blogid;
+        $recorded_comment->comment_id = $comment_id;
+        $recorded_comment->comment_post_id = $comment->comment_post_ID;
+        $recorded_comment->date_created = strtotime( $comment->comment_date );
+
+        $recorded_commment_id = $recorded_comment->save();
+
+        bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', time() );
+    }
+
+    if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
+        /* 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>';
+
+        /* 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 ),
+            'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
+            'component_action' => 'new_blog_comment',
+            'item_id' => $wpdb->blogid,
+            'secondary_item_id' => $comment_id,
+            'recorded_time' => strtotime( $comment->comment_date )
+        ) );
+    }
+
+    return $recorded_comment;
+}
+add_action( 'comment_post', 'bp_blogs_record_comment', 10, 2 );
+
+function bp_blogs_approve_comment( $comment_id, $comment_status ) {
+    global $bp, $wpdb;
+
+    if ( 'approve' != $comment_status )
+        return false;
+
+    $recorded_comment = bp_blogs_record_comment( $comment_id, true );
+    $comment = get_comment($comment_id);
+    $comment->post = get_post( $comment->comment_post_ID );
+
+    bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'secondary_item_id' => $recorded_comment->blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_comment' ) );
 
     if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
         /* Record in activity streams */
         $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_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 = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->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>';
 
@@ -478 +519 @@
         ) );
     }
-
-    return $recorded_comment;
-}
-add_action( 'comment_post', 'bp_blogs_record_comment', 10, 2 );
-
-function bp_blogs_approve_comment( $comment_id, $comment_status ) {
-    global $bp, $wpdb;
-
-    if ( 'approve' != $comment_status )
-        return false;
-
-    $recorded_comment = bp_blogs_record_comment( $comment_id, true );
-    $comment = get_comment($comment_id);
-    $comment->post = get_post( $comment->comment_post_ID );
-
-    bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'secondary_item_id' => $recorded_comment->blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_comment' ) );
-
-    if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
-        /* Record in activity streams */
-        $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
-        $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->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' => $recorded_comment->user_id,
-            'content' => apply_filters( 'bp_blogs_activity_new_comment', $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',
-            'item_id' => $comment_id,
-            'secondary_item_id' => $recorded_comment->blog_id,
-            'recorded_time' =>  $recorded_comment->date_created
-        ) );
-    }
 }
 add_action( 'wp_set_comment_status', 'bp_blogs_approve_comment', 10, 2 );