Ticket #6687: 6687.patch

src/bp-activity/bp-activity-functions.php

@@ -132 +132 @@
 function bp_activity_clear_new_mentions( $user_id ) {
         bp_delete_user_meta( $user_id, 'bp_new_mention_count' );
         bp_delete_user_meta( $user_id, 'bp_new_mentions'      );
+
+        /**
+         * Fires once mentions has been cleared for a given user.
+         *
+         * @since  ?
+         *
+         * @param  int $user_id
+         */
+        do_action( 'bp_activity_clear_new_mentions', $user_id );
 }
 
 /**

src/bp-activity/bp-activity-notifications.php

@@ -501 +501 @@
  *
  * @uses bp_notifications_mark_all_notifications_by_type()
  */
-function bp_activity_remove_screen_notifications() {
+function bp_activity_remove_screen_notifications( $user_id = 0 ) {
         if ( ! bp_is_active( 'notifications' ) ) {
                 return;
         }
 
         // Only mark read if you're looking at your own mentions.
-        if ( ! bp_is_my_profile() ) {
-                return;
+        if ( bp_is_my_profile() || (int) $user_id === (int) bp_loggedin_user_id() ) {
+                bp_notifications_mark_notifications_by_type( bp_loggedin_user_id(), buddypress()->activity->id, 'new_at_mention' );
         }
-
-        bp_notifications_mark_notifications_by_type( bp_loggedin_user_id(), buddypress()->activity->id, 'new_at_mention' );
 }
-add_action( 'bp_activity_screen_mentions', 'bp_activity_remove_screen_notifications' );
+add_action( 'bp_activity_screen_mentions', 'bp_activity_remove_screen_notifications', 10, 0 );
+add_action( 'bp_activity_clear_new_mentions', 'bp_activity_remove_screen_notifications', 10, 1 );
 
 /**
  * Mark at-mention notification as read when user visits the activity with the mention.