Changeset 1048 for trunk/bp-blogs.php

Timestamp:

02/10/2009 08:50:05 PM (16 years ago)

Author:

apeatling

Message:

Fixes #464

File:

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

trunk/bp-blogs.php

@@ -268 +268 @@
         break;
         case 'new_blog_post':
-            $post = new BP_Blogs_Post($item_id);
+            $post = new BP_Blogs_Post($secondary_item_id);
             
             if ( !$post )
@@ -296 +296 @@
                 return false;
 
-            $comment = new BP_Blogs_Comment($item_id);
+            $comment = new BP_Blogs_Comment($secondary_item_id);
             
             if ( !$comment )
@@ -432 +432 @@
             
             // Record in activity streams
-            bp_blogs_record_activity( array( 'item_id' => $recorded_post_id, 'component_name' => 'blogs', 'component_action' => 'new_blog_post', 'is_private' => $is_private, 'user_id' => $recorded_post->user_id ) );
+            bp_blogs_record_activity( array( 'item_id' => $recorded_post->blog_id, 'secondary_item_id' => $recorded_post_id, 'component_name' => 'blogs', 'component_action' => 'new_blog_post', 'is_private' => $is_private, 'user_id' => $recorded_post->user_id ) );
         }
     } else {
@@ -508 +508 @@
                 
                 // Record in activity streams
-                bp_blogs_record_activity( array( 'item_id' => $recorded_commment_id, 'component_name' => 'blogs', 'component_action' => 'new_blog_comment', 'is_private' => $is_private, 'user_id' => $recorded_comment->user_id ) );
+                bp_blogs_record_activity( array( 'item_id' => $recorded_comment->blog_id, 'secondary_item_id' => $recorded_commment_id, 'component_name' => 'blogs', 'component_action' => 'new_blog_comment', 'is_private' => $is_private, 'user_id' => $recorded_comment->user_id ) );
             }
         } else {
@@ -635 +635 @@
 
 function bp_blogs_remove_data_for_blog( $blog_id ) {
+    global $bp;
+    
     /* If this is regular blog, delete all data for that blog. */
     BP_Blogs_Blog::delete_blog_for_all( $blog_id );
     BP_Blogs_Post::delete_posts_for_blog( $blog_id );       
     BP_Blogs_Comment::delete_comments_for_blog( $blog_id );
+
+    // Delete activity stream item
+    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component_name' => 'blogs', 'component_action' => false, 'user_id' => $bp->loggedin_user->id ) );
 
     do_action( 'bp_blogs_remove_data_for_blog', $blog_id );
@@ -722 +727 @@
 
     if ( !$meta_key ) {
-        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->blogs->table_name_blogpmeta . " WHERE blog_id = %d", $blog_id ) );      
+        $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d", $blog_id ) );     
     } else if ( !$meta_value ) {
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s AND meta_value = %s", $blog_id, $meta_key, $meta_value ) );