Changeset 1389

Timestamp:

04/22/2009 07:00:12 PM (17 years ago)

Author:

apeatling

Message:

Removing $bp check as it is no longer needed.

File:

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

trunk/bp-blogs.php

@@ -358 +358 @@
 function bp_blogs_record_blog( $blog_id, $user_id ) {
         global $bp;
-        
-        if ( !$bp ) {
-                bp_core_setup_globals();
-                bp_blogs_setup_globals();
-        }
-        
+
         if ( !$user_id )
                 $user_id = $bp->loggedin_user->id;
@@ -394 +389 @@
 function bp_blogs_record_post( $post_id, $blog_id = false, $user_id = false ) {
         global $bp, $wpdb;
-        
-        if ( !$bp ) {
-                bp_core_setup_globals();
-                bp_blogs_setup_globals();
-        }
 
         $post_id = (int)$post_id;
@@ -429 +419 @@
                         
                         bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
-                        
-                        if ( strtotime( $recorded_post->date_created ) >= strtotime( "-24 hours" ) ) {
-                                // Record in activity streams, but only if the post is 30 minutes
-                                // old or less (stops old posts registering as new posts in activity streams when a comment is posted on them)
-                                bp_blogs_record_activity( array( 'item_id' => $recorded_post->id, 'component_name' => 'blogs', 'component_action' => 'new_blog_post', 'is_private' => bp_blogs_is_blog_hidden( $recorded_post->blog_id ), 'user_id' => $recorded_post->user_id ) );
-                        }
+                        bp_blogs_record_activity( array( 'item_id' => $recorded_post->id, 'component_name' => 'blogs', 'component_action' => 'new_blog_post', 'is_private' => bp_blogs_is_blog_hidden( $recorded_post->blog_id ), 'user_id' => $recorded_post->user_id, 'recorded_time' => strtotime( $post->post_date ) ) );
                 }
         } else {
@@ -466 +451 @@
 }
 add_action( 'publish_post', 'bp_blogs_record_post' );
+add_action( 'edit_post', 'bp_blogs_record_post' );
+
 
 function bp_blogs_record_comment( $comment_id, $is_approved ) {
@@ -527 +514 @@
 function bp_blogs_remove_blog( $blog_id ) {
         global $bp;
-        
-        if ( !$bp ) {
-                bp_core_setup_globals();
-                bp_blogs_setup_globals();
-        }
-        
+
         $blog_id = (int)$blog_id;
 
@@ -561 +543 @@
 function bp_blogs_remove_post( $post_id ) {
         global $current_blog, $bp;
-        
-        if ( !$bp ) {
-                bp_core_setup_globals();
-                bp_blogs_setup_globals();
-        }
-        
+
         $post_id = (int)$post_id;
         $blog_id = (int)$current_blog->blog_id;
@@ -576 +553 @@
                 
         // Delete activity stream item
-        bp_blogs_delete_activity( array( 'item_id' => $post->blog_id, 'secondary_item_id' => $post->id, 'component_name' => 'blogs', 'component_action' => 'new_blog_post', 'user_id' => $post->user_id ) );
+        bp_blogs_delete_activity( array( 'item_id' => $post->id, 'component_name' => 'blogs', 'component_action' => 'new_blog_post', 'user_id' => $post->user_id ) );
 
         do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $post->user_id );
@@ -584 +561 @@
 function bp_blogs_remove_comment( $comment_id ) {
         global $wpdb, $bp;
-        
-        if ( !$bp ) {
-                bp_core_setup_globals();
-                bp_blogs_setup_globals();
-        }
-        
+
         $recorded_comment = new BP_Blogs_Comment( false, $wpdb->blogid, $comment_id );
         BP_Blogs_Comment::delete( $comment_id, $wpdb->blogid );