Changeset 1067

Timestamp:

02/12/2009 02:18:42 AM (17 years ago)

Author:

apeatling

Message:

Fixed bug around recording of password protected posts.

Location:

trunk

Files:

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

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

@@ -100 +100 @@
             $cached_component_action_sql = $wpdb->prepare( "AND component_action = %s", $component_action );
         }
-        
-        error_log( $component_action );
-        
-        error_log( $wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity WHERE item_id = %d {$secondary_sql} AND component_name = %s {$component_action_sql}", $item_id, $component_name ) );
-        error_log( $wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity_cached WHERE item_id = %d {$secondary_sql} AND component_name = %s {$cached_component_action_sql}", $item_id, $component_name ) );
-        error_log( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name_sitewide} WHERE item_id = %d {$secondary_sql} AND component_name = %s {$component_action_sql}", $item_id, $component_name ) );
-        
+                
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity WHERE item_id = %d {$secondary_sql} AND component_name = %s {$component_action_sql}", $item_id, $component_name ) );
                 
@@ -112 +106 @@
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity_cached WHERE item_id = %d {$secondary_sql} AND component_name = %s {$cached_component_action_sql}", $item_id, $component_name ) );
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name_sitewide} WHERE item_id = %d {$secondary_sql} AND component_name = %s {$component_action_sql}", $item_id, $component_name ) );
-        
+
         return true;
     }

trunk/bp-blogs.php

@@ -8 +8 @@
 
 /* These will be moved into admin configurable settings */
-define ( 'TOTAL_RECORDED_POSTS', 10 );
-define ( 'TOTAL_RECORDED_COMMENTS', 25 );
+define ( 'TOTAL_RECORDED_POSTS', 150 );
+define ( 'TOTAL_RECORDED_COMMENTS', 500 );
 
 include_once( 'bp-blogs/bp-blogs-classes.php' );
@@ -410 +410 @@
     
     if ( !$is_recorded = BP_Blogs_Post::is_recorded( $post_id, $blog_id, $user_id ) ) {
-        if ( 'publish' == $post->post_status ) {
+        if ( 'publish' == $post->post_status && '' == $post->post_password ) {
             
             /** 
@@ -442 +442 @@
          *  - The post is password protected
          */
-        if ( $post->post_status != 'publish' || $post->post_password != '' )
+        if ( 'publish' != $post->post_status || '' != $post->post_password )
             bp_blogs_remove_post( $post_id, $blog_id );
         
@@ -606 +606 @@
     // 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 ) );
+    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 ) );
 
     do_action( 'bp_blogs_remove_post', $blog_id, $post_id );
@@ -628 +628 @@
 
     // Delete activity stream item
-    bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'component_name' => 'blogs', 'component_action' => 'new_blog_comment', 'user_id' => $bp->loggedin_user->id ) );
+    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'secondary_item_id' => $comment_id, 'component_name' => 'blogs', 'component_action' => 'new_blog_comment', 'user_id' => $bp->loggedin_user->id ) );
 
     do_action( 'bp_blogs_remove_comment', $blog_id, $comment_id );

trunk/bp-core.php

@@ -982 +982 @@
         return false;
     
-    if ( time() >= strtotime( '+5 minutes', get_usermeta( $bp->loggedin_user->id, 'last_activity' ) ) || '' == get_usermeta( $bp->loggedin_user->id, 'last_activity' ) ) {
-        // Updated last site activity for this user.
+    if ( '' == get_usermeta( $bp->loggedin_user->id, 'last_activity' ) )
+        update_usermeta( $bp->loggedin_user->id, 'last_activity', time() );     
+    
+    if ( time() >= strtotime( '+5 minutes', get_usermeta( $bp->loggedin_user->id, 'last_activity' ) ) )
         update_usermeta( $bp->loggedin_user->id, 'last_activity', time() );
-    }
 }
 add_action( 'wp_head', 'bp_core_record_activity' );