Changeset 7530 for trunk/bp-friends/bp-friends-functions.php

Timestamp:

11/08/2013 05:20:46 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Introduce bp_core_mark_notifications_by_type() and bp_core_mark_notifications_by_item_id() and replace bp_core_delete_notifications_by_type() and bp_core_delete_notifications_by_item_id() usages.

Ensures notifications are toggled as acknowledged rather than deleted. See #5148.

File:

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

trunk/bp-friends/bp-friends-functions.php

@@ -90 +90 @@
 
         // Remove the friend request notice
-        bp_core_delete_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
+        bp_core_mark_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
 
         // Add a friend accepted notice for the initiating user
@@ -134 +134 @@
 
     if ( !$friendship->is_confirmed && BP_Friends_Friendship::reject( $friendship_id ) ) {
+
         // Remove the friend request notice
-        bp_core_delete_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
+        bp_core_mark_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
 
         do_action_ref_array( 'friends_friendship_rejected', array( $friendship_id, &$friendship ) );