Changeset 1245

Timestamp:

03/19/2009 09:26:24 PM (16 years ago)

Author:

apeatling

Message:

Fixes #584

Location:

trunk

Files:

• bp-core.php (modified) (2 diffs)
• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-core/bp-core-notifications.php (modified) (1 diff)
• bp-friends.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)

trunk/bp-core.php

@@ -1077 +1077 @@
     return $wpdb->get_var( $wpdb->prepare( "SELECT path FROM {$wpdb->base_prefix}site WHERE id = 1") );
 }
-
 
 function bp_core_redirect( $location, $status = 302 ) {
@@ -1361 +1360 @@
     /* Remove usermeta */
     delete_usermeta( $user_id, 'last_activity' );
+
+    /* Flush the cache to remove the user from all cached objects */
     wp_cache_flush();
 }

trunk/bp-core/bp-core-classes.php

@@ -309 +309 @@
     }
     
+    function delete_from_user_by_type( $user_id, $component_name, $component_action ) {
+        global $wpdb, $bp;
+        
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->core->table_name_notifications} WHERE item_id = %d AND component_name = %s AND component_action = %s", $user_id, $component_name, $component_action ) );
+    }
+    
     function delete_all_by_type( $item_id, $component_name, $component_action, $secondary_item_id ) {
         global $wpdb, $bp;

trunk/bp-core/bp-core-notifications.php

@@ -85 +85 @@
 }
 
+function bp_core_delete_notifications_from_user( $user_id, $component_name, $component_action ) {
+    return BP_Core_Notification::delete_from_user_by_type( $user_id, $component_name, $component_action );
+}
+
 function bp_core_check_notification_access( $user_id, $notification_id ) {
     if ( !BP_Core_Notification::check_access( $user_id, $notification_id ) )

trunk/bp-friends.php

@@ -613 +613 @@
     /* Remove usermeta */
     delete_usermeta( $user_id, 'total_friend_count' );
+    
+    /* Remove friendship requests FROM user */
+    bp_core_delete_notifications_from_user( $user_id, $bp->friends->slug, 'friendship_request' );
 
     do_action( 'friends_remove_data', $user_id );

trunk/bp-xprofile.php

@@ -852 +852 @@
     $field->user_id = $user_id;
     $field->value = $value;
-
+    
     return $field->save();
 }