Changeset 3232 for trunk/bp-friends.php

Timestamp:

09/06/2010 04:24:57 PM (15 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

File:

• trunk/bp-friends.php (modified) (2 diffs)

trunk/bp-friends.php

@@ -566 +566 @@
     do_action( 'friends_remove_data', $user_id );
 }
-add_action( 'wpmu_delete_user', 'friends_remove_data' );
-add_action( 'delete_user', 'friends_remove_data' );
-add_action( 'make_spam_user', 'friends_remove_data' );
+add_action( 'wpmu_delete_user', 'friends_remove_data', 1 );
+add_action( 'delete_user', 'friends_remove_data', 1 );
+add_action( 'make_spam_user', 'friends_remove_data', 1 );
 
 
@@ -595 +595 @@
     global $bp;
 
-    if ( isset( $_GET['new'] ) )
-        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->friends->id, 'friendship_accepted' );
+    if ( isset($_GET['new']) )
+        bp_core_delete_notifications_for_user_by_type( $bp->displayed_user->id, $bp->friends->id, 'friendship_accepted' );
 }
 add_action( 'bp_activity_screen_my_activity', 'friends_clear_friend_notifications' );