Changeset 7529 for trunk/bp-friends/bp-friends-screens.php

Timestamp:

11/08/2013 05:09:31 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Introduce bp_core_mark_all_notifications_by_type() and replace bp_core_delete_all_notifications_by_type() usages. Ensures notifications are toggled as acknowledged rather than deleted. See #5148.

File:

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

trunk/bp-friends/bp-friends-screens.php

@@ -16 +16 @@
 
 function friends_screen_my_friends() {
-    global $bp;
 
     // Delete any friendship acceptance notifications for the user when viewing a profile
-    bp_core_delete_notifications_by_type( bp_loggedin_user_id(), $bp->friends->id, 'friendship_accepted' );
+    bp_core_mark_all_notifications_by_type( bp_loggedin_user_id(), buddypress()->friends->id, 'friendship_accepted' );
 
     do_action( 'friends_screen_my_friends' );
@@ -63 +62 @@
     do_action( 'friends_screen_requests' );
 
-    if ( isset( $_GET['new'] ) )
-        bp_core_delete_notifications_by_type( bp_loggedin_user_id(), 'friends', 'friendship_request' );
+    if ( isset( $_GET['new'] ) ) {
+        bp_core_mark_all_notifications_by_type( bp_loggedin_user_id(), buddypress()->friends->id, 'friendship_request' );
+    }
 
     bp_core_load_template( apply_filters( 'friends_template_requests', 'members/single/home' ) );