Ticket #7349: 7349.ray.03.patch

src/bp-messages/bp-messages-actions.php

@@ -222 +222 @@
         $thread_id = (int) bp_action_variable( 0 );
 
         if ( ! messages_is_valid_thread( $thread_id ) || ( ! messages_check_thread_access( $thread_id ) && ! bp_current_user_can( 'bp_moderate' ) ) ) {
-                bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() ) );
+                return;
         }
 
         // Check if a new reply has been submitted.

src/bp-messages/bp-messages-screens.php

@@ -120 +120 @@
 
         $thread_id = (int) bp_action_variable( 0 );
 
-        if ( empty( $thread_id ) || ! messages_is_valid_thread( $thread_id ) || ( ! messages_check_thread_access( $thread_id ) && ! bp_current_user_can( 'bp_moderate' ) ) ) {
+        if ( empty( $thread_id ) || ! messages_is_valid_thread( $thread_id ) ) {
                 bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() ) );
         }
 
+        if ( ! messages_check_thread_access( $thread_id ) && ! bp_current_user_can( 'bp_moderate' ) ) {
+                bp_core_no_access();
+                return;
+        }
+
         // Load up BuddyPress one time.
         $bp = buddypress();