Ticket #3213: 3213.patch

notifications.php

@@ -189 +189 @@
 
         // Get required data
         $user_id  = bp_loggedin_user_id();
-        $topic_id = intval( $_GET['topic_id'] );
+        $topic_id = absint( $_GET['topic_id'] );
 
+        // Redirect to this topic ID by default
+        $redirect_id = $topic_id;
+
         // Check nonce
         if ( ! bbp_verify_nonce_request( 'bbp_mark_topic_' . $topic_id ) ) {
                 bbp_add_error( 'bbp_notification_topic_id', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
@@ -203 +206 @@
         // Bail if we have errors
         if ( ! bbp_has_errors() ) {
 
-                // Attempt to clear notifications for the current user from this topic
-                $success = bp_notifications_mark_notifications_by_item_id( $user_id, $topic_id, bbp_get_component_name(), 'bbp_new_reply' );
+                // Get these once
+                $post_type = bbp_get_reply_post_type();
+                $component = bbp_get_component_name();
 
+                // Attempt to clear notifications for this topic
+                $success   = bp_notifications_mark_notifications_by_item_id( $user_id, $topic_id, $component, 'bbp_new_reply' );
+
+                // Get all reply IDs for the topic
+                $replies   = bbp_get_all_child_ids( $topic_id, $post_type );
+
+                // If topic has replies
+                if ( ! empty( $replies ) ) {
+
+                        // Loop through each reply and attempt to mark it
+                        foreach ( $replies as $reply_id ) {
+
+                                // Attempt to mark notification for this reply ID
+                                $success = bp_notifications_mark_notifications_by_item_id( $user_id, $reply_id, $component, 'bbp_new_reply' );
+
+                                // If marked, redirect to this reply ID
+                                if ( ! empty( $success ) ) {
+                                        $redirect_id = $reply_id;
+                                }
+                        }
+                }
+
                 // Do additional subscriptions actions
                 do_action( 'bbp_notifications_handler', $success, $user_id, $topic_id, $action );
         }
 
         // Redirect to the topic
-        $redirect = bbp_get_reply_url( $topic_id );
+        $redirect = bbp_get_reply_url( $redirect_id );
 
         // Redirect
         bbp_redirect( $redirect );