Changeset 846

Timestamp:

01/15/2009 08:08:59 PM (18 years ago)

Author:

apeatling

Message:

Fixes #312

Location:

trunk

Files:

• bp-activity.php (modified) (1 diff)
• bp-activity/bp-activity-classes.php (modified) (2 diffs)
• bp-blogs.php (modified) (5 diffs)
• bp-core/bp-core-templatetags.php (modified) (1 diff)

trunk/bp-activity.php

@@ -213 +213 @@
 function bp_activity_record( $item_id, $component_name, $component_action, $is_private, $secondary_item_id = false, $user_id = false, $secondary_user_id = false ) {
         global $bp, $wpdb;
-
+        
         if ( !$user_id )
                 $user_id = $bp['loggedin_userid'];

trunk/bp-activity/bp-activity-classes.php

@@ -68 +68 @@
                         // Add the cached version of the activity to the sitewide activity table.
                         if ( !$this->no_sitewide_recording )
-                                $sitewide_cached = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_sitewide'] . " ( user_id, item_id, secondary_item_id, content, primary_link, component_name, component_action, date_cached, date_recorded ) VALUES ( %d, %d, %d, %s, %s, %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d) )", $bp['loggedin_userid'], $this->item_id, $this->secondary_item_id, $activity_content['content'], $activity_content['primary_link'], $this->component_name, $this->component_action, time(), $this->date_recorded ) );
+                                $sitewide_cached = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_sitewide'] . " ( user_id, item_id, secondary_item_id, content, primary_link, component_name, component_action, date_cached, date_recorded ) VALUES ( %d, %d, %d, %s, %s, %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d) )", $this->user_id, $this->item_id, $this->secondary_item_id, $activity_content['content'], $activity_content['primary_link'], $this->component_name, $this->component_action, time(), $this->date_recorded ) );
                         
                         if ( $activity && $activity_cached )
@@ -93 +93 @@
                         $secondary_sql = $wpdb->prepare( " AND secondary_item_id = %d", $secondary_item_id );
                 
-                //var_dump($wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity WHERE item_id = %d{$secondary_sql} AND user_id = %d AND component_name = %s AND component_action = %s", $item_id, $user_id, $component_name, $component_action ) );
-                //var_dump($wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity_cached WHERE item_id = %d{$secondary_sql} AND component_name = %s AND component_action = %s", $item_id, $component_name, $component_action ) );
-                //var_dump($wpdb->prepare( "DELETE FROM " . $bp['activity']['table_name_sitewide'] . " WHERE item_id = %d{$secondary_sql} AND user_id = %d AND component_name = %s AND component_action = %s", $item_id, $user_id, $component_name, $component_action ) );
-                //die;
+                //error_log($wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity WHERE item_id = %d{$secondary_sql} AND user_id = %d AND component_name = %s AND component_action = %s", $item_id, $user_id, $component_name, $component_action ) );
+                //error_log($wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity_cached WHERE item_id = %d{$secondary_sql} AND component_name = %s AND component_action = %s", $item_id, $component_name, $component_action ) );
+                //error_log($wpdb->prepare( "DELETE FROM " . $bp['activity']['table_name_sitewide'] . " WHERE item_id = %d{$secondary_sql} AND user_id = %d AND component_name = %s AND component_action = %s", $item_id, $user_id, $component_name, $component_action ) );
                 
                 $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity WHERE item_id = %d{$secondary_sql} AND user_id = %d AND component_name = %s AND component_action = %s", $item_id, $user_id, $component_name, $component_action ) );

trunk/bp-blogs.php

@@ -374 +374 @@
         
         $post_id = (int)$post_id;
+        $post = get_post($post_id);
         
         if ( !$user_id )
-                $user_id = (int)$bp['loggedin_userid'];
+                $user_id = (int)$post->post_author;
                 
         if ( !$blog_id )
@@ -384 +385 @@
         if ( (int)get_site_option('tags_blog_id') == $blog_id )
                 return false;
-        
-        $post = get_post($post_id);
-        
-        /* If another user is editing this post, don't record this at all, otherwise
-           we will get multiple post recordings for each revisor. */
-        if ( $user_id != (int)$post->post_author )
-                return false;
-        
+                
         /* Don't record this if it's not a post */
         if ( $post->post_type != 'post' )
@@ -403 +397 @@
                          * at the max, then delete the oldest recorded post first.
                          */
-                        if ( BP_Blogs_Post::get_total_recorded_for_user() >= TOTAL_RECORDED_POSTS )
-                                BP_Blogs_Post::delete_oldest();
+                        if ( BP_Blogs_Post::get_total_recorded_for_user( $user_id ) >= TOTAL_RECORDED_POSTS )
+                                BP_Blogs_Post::delete_oldest( $user_id );
                         
                         $recorded_post = new BP_Blogs_Post;
@@ -422 +416 @@
                 }
         } else {
-                /** 
-                 * Check to see if the post have previously been recorded.
-                 * If the post status has changed from public to private then we need
-                 * to remove the record of the post.
+                $existing_post = new BP_Blogs_Post( null, $blog_id, $post_id );
+                
+                /**
+                 *  Delete the recorded post if:
+                 *  - The status is no longer "published"
+                 *  - The post is password protected
                  */
-                if ( $post->post_status != 'publish' || $post->post_password != '')
-                        BP_Blogs_Post::delete( $post_id, $blog_id );
+                if ( $post->post_status != 'publish' || $post->post_password != '' )
+                        bp_blogs_remove_post( $post_id, $blog_id );
+                
+                // Check to see if the post author has changed.
+                if ( (int)$existing_post->user_id != (int)$post->post_author ) {
+                        // Delete the existing recorded post
+                        bp_blogs_remove_post( $post_id, $blog_id );
+                        
+                        // Re-record the post with the new author.
+                        bp_blogs_record_post( $post_id );
+                }
         }
 
@@ -580 +585 @@
         // Delete post from the bp_blogs table
         BP_Blogs_Post::delete( $post_id, $blog_id );
-
+        
         // Delete activity stream item
         bp_blogs_delete_activity( array( 'item_id' => $post->id, 'component_name' => 'blogs', 'component_action' => 'new_blog_post', 'user_id' => $post->user_id ) );

trunk/bp-core/bp-core-templatetags.php

@@ -13 +13 @@
  * or not to highlight a particular nav item.
  *
- * It will also compare the current user to the logged in user, if a user profile is being viewed.
- * This allows the "Friends" item to be highlighted if the users are friends. This is only if the friends
- * component is installed.
- * 
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses friends_check_friendship() Checks to see if the logged in user is a friend of the currently viewed user.
  */
 function bp_get_nav() {