Ticket #8426: 8426.4.patch

src/bp-messages/bp-messages-notifications.php

@@ -261 +261 @@
  * @since 3.0.0
  *
  * @param int $thread_id ID of the thread being marked as read.
+ * @param int $user_id ID of the user thread will be marked as unread.
+ * @param int $num_rows The number of affected rows by the "mark read" update query.
  */
-function bp_messages_mark_notification_on_mark_thread( $thread_id ) {
+function bp_messages_mark_notification_on_mark_thread( $thread_id, $user_id, $num_rows = 0 ) {
+        if ( ! $num_rows ) {
+                return;
+        }
+
         $thread_messages = BP_Messages_Thread::get_messages( $thread_id );
 
         foreach ( $thread_messages as $thread_message ) {
-                bp_notifications_mark_notifications_by_item_id( bp_loggedin_user_id(), $thread_message->id, buddypress()->messages->id, 'new_message' );
+                bp_notifications_mark_notifications_by_item_id( $user_id, $thread_message->id, buddypress()->messages->id, 'new_message' );
         }
 }
-add_action( 'messages_thread_mark_as_read', 'bp_messages_mark_notification_on_mark_thread' );
+add_action( 'messages_thread_mark_as_read', 'bp_messages_mark_notification_on_mark_thread', 10, 3 );
 
 /**
  * When a message is deleted, delete corresponding notifications.

src/bp-messages/classes/class-bp-messages-thread.php

@@ -655 +655 @@
                                 bp_loggedin_user_id();
                 }
 
-                $bp     = buddypress();
-                $retval = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 0 WHERE user_id = %d AND thread_id = %d", $user_id, $thread_id ) );
+                $bp       = buddypress();
+                $num_rows = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 0 WHERE user_id = %d AND thread_id = %d", $user_id, $thread_id ) );
 
                 wp_cache_delete( 'thread_recipients_' . $thread_id, 'bp_messages' );
                 wp_cache_delete( $user_id, 'bp_messages_unread_count' );
@@ -666 +666 @@
                  *
                  * @since 2.8.0
                  * @since 9.0.0 Added the `user_id` parameter.
+                 * @since 10.0.0 Passes the number of affected rows into the action.
                  *
                  * @param int $thread_id The message thread ID.
                  * @param int $user_id   The user the thread will be marked as read.
+                 * @param bool|int $num_rows Number of threads marked as unread or false on error.
                  */
-                do_action( 'messages_thread_mark_as_read', $thread_id, $user_id );
+                do_action( 'messages_thread_mark_as_read', $thread_id, $user_id, $num_rows );
 
-                return $retval;
+                return $num_rows;
         }
 
         /**
@@ -699 +701 @@
                                 bp_loggedin_user_id();
                 }
 
-                $bp     = buddypress();
-                $retval = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 1 WHERE user_id = %d AND thread_id = %d", $user_id, $thread_id ) );
+                $bp       = buddypress();
+                $num_rows = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 1 WHERE user_id = %d AND thread_id = %d", $user_id, $thread_id ) );
 
                 wp_cache_delete( 'thread_recipients_' . $thread_id, 'bp_messages' );
                 wp_cache_delete( $user_id, 'bp_messages_unread_count' );
@@ -710 +712 @@
                  *
                  * @since 2.8.0
                  * @since 9.0.0  Added the `$user_id` parameter.
-                 * @since 10.0.0 Added the `$retval` parameter.
+                 * @since 10.0.0 Added the `$num_rows` parameter.
                  *
                  * @param int      $thread_id The message thread ID.
                  * @param int      $user_id   The user the thread will be marked as unread.
-                 * @param bool|int $retval     =Number of threads marked as unread or false on error.
+                 * @param bool|int $num_rows    Number of threads marked as unread or false on error.
                  */
-                do_action( 'messages_thread_mark_as_unread', $thread_id, $user_id, $retval );
+                do_action( 'messages_thread_mark_as_unread', $thread_id, $user_id, $num_rows );
 
-                return $retval;
+                return $num_rows;
         }
 
         /**